diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
| commit | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (patch) | |
| tree | ef36b7031df4c96eab6b5f3343325f662382932c /indra/cmake/FindJsonCpp.cmake | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
| parent | 15d8f355072f2184f046a7aafb1b5c606fe97880 (diff) | |
Merge
Diffstat (limited to 'indra/cmake/FindJsonCpp.cmake')
| -rwxr-xr-x | indra/cmake/FindJsonCpp.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake index 0b056ada58..9398779cff 100755 --- a/indra/cmake/FindJsonCpp.cmake +++ b/indra/cmake/FindJsonCpp.cmake @@ -23,10 +23,10 @@ EXEC_PROGRAM(${CMAKE_CXX_COMPILER} # 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) +IF (USESYSTEMLIBS) # On standalone, assume that the system installed library was compiled with the used compiler. SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) -ENDIF (STANDALONE) +ENDIF (USESYSTEMLIBS) FIND_LIBRARY(JSONCPP_LIBRARY NAMES ${JSONCPP_NAMES} PATHS /usr/lib /usr/local/lib |