diff options
| author | simon <none@none> | 2014-07-07 16:17:53 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-07-07 16:17:53 -0700 |
| commit | bfa42c9e28075cb35f80e6fce7d1db0443027052 (patch) | |
| tree | b4e209e91cd173473f3c2033487647c5eb8c6b5d /indra/cmake/JsonCpp.cmake | |
| parent | 114f7b5d0f46dfcbc9a94c1907e396b6e02700f6 (diff) | |
| parent | 3e6698073cedc8b24068147cf6b7091f081ea125 (diff) | |
Merge downstream code and become 3.7.12
Diffstat (limited to 'indra/cmake/JsonCpp.cmake')
| -rwxr-xr-x | indra/cmake/JsonCpp.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 7ad73e5683..0aab2d6634 100755 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -5,9 +5,9 @@ include(Prebuilt) set(JSONCPP_FIND_QUIETLY ON) set(JSONCPP_FIND_REQUIRED ON) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindJsonCpp) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(jsoncpp) if (WINDOWS) set(JSONCPP_LIBRARIES @@ -19,4 +19,4 @@ else (STANDALONE) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) endif (WINDOWS) set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") -endif (STANDALONE) +endif (USESYSTEMLIBS) |