diff options
| author | Andrew de Laix <alain@lindenlab.com> | 2011-03-02 21:28:26 +0000 |
|---|---|---|
| committer | Andrew de Laix <alain@lindenlab.com> | 2011-03-02 21:28:26 +0000 |
| commit | 99ba5e2670d04baf641c6d612f253a46f857769e (patch) | |
| tree | 98f860b929b0b90fc88f27814df6af54efdf742d /indra | |
| parent | 49f5a3ec7d7fe71b1dc1bc45136997cd8695431e (diff) | |
revert to old jsoncpp library on linux to fix build.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 96488360a4..9024fa92a7 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -16,7 +16,7 @@ else (STANDALONE) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) + set(JSONCPP_LIBRARIES libjsoncpp.a) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) + set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") endif (STANDALONE) |