diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:54 -0500 |
| commit | b7c49f0f47f53d200df5afe4a4b68a83dd789918 (patch) | |
| tree | 8941117f3f0384be524a8013cdd3b159642ebde1 /indra/cmake/JsonCpp.cmake | |
| parent | 64c07135bab95b5425ddff69351f0c86301def97 (diff) | |
| parent | 781bd2ce1956c32db72ec0d477edc44619f39f05 (diff) | |
merge up from viewer-development and viewer-autobuild
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) |