diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-11 19:42:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-11 19:42:26 -0500 |
| commit | 7309fda08c5bd13c1966a4024f193074f0b4a410 (patch) | |
| tree | b7eea9121560e1d13ed41f9dd5946738755da320 /indra/cmake/JsonCpp.cmake | |
| parent | 4223ab9acf282f52aac2bcf124f4b2912c2fe88e (diff) | |
| parent | c20eb01ff2adfc23b83d1d5c8723962f794fdbf4 (diff) | |
sync up to latest viewer-development
Diffstat (limited to 'indra/cmake/JsonCpp.cmake')
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 7dd565be7c..66c1739ff4 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -11,12 +11,12 @@ else (STANDALONE) use_prebuilt_binary(jsoncpp) if (WINDOWS) set(JSONCPP_LIBRARIES - debug json_vc80d - optimized json_vc80) + debug json_vc100debug_libmt.lib + optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt) + set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES jsoncpp) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (STANDALONE) |