diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-03 21:18:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 21:18:15 -0500 |
| commit | c20eb01ff2adfc23b83d1d5c8723962f794fdbf4 (patch) | |
| tree | eec524d10d41ec5184a34e78df5aab6180db75c4 /indra/cmake/JsonCpp.cmake | |
| parent | a8b9392fd83c9fcd2261e76a135d451ae5b90e9b (diff) | |
| parent | 856a6992ebb0989e5d143d987a3e9ba79bb6492e (diff) | |
pull up changes from 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) |