diff -r b0689af42a71 indra/cmake/FindJsonCpp.cmake --- a/indra/cmake/FindJsonCpp.cmake Wed Dec 15 20:55:10 2010 +0100 +++ b/indra/cmake/FindJsonCpp.cmake Sun Dec 19 18:08:15 2010 +0100 @@ -21,7 +21,12 @@ OUTPUT_STRIP_TRAILING_WHITESPACE ) +# Try to find a library that was compiled with the same compiler version as we currently use. SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so) +IF (STANDALONE) + # On standalone, assume that the system installed library was compiled with the used compiler. + SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) +ENDIF (STANDALONE) FIND_LIBRARY(JSONCPP_LIBRARY NAMES ${JSONCPP_NAMES} PATHS /usr/lib /usr/local/lib