diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-27 06:39:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-27 06:39:42 -0400 |
| commit | 5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (patch) | |
| tree | 550521651fb4a14124f9c6aed3c9018b29d92920 /indra/cmake/JsonCpp.cmake | |
| parent | b7b9a37bc13d40a3caf7ea77d6857c2bb6036e06 (diff) | |
| parent | 3df0b60b3ad338a62a27e1492990f15c1393ea03 (diff) | |
merge out latest changes from 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..499b00fb44 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_linux-gcc-4.0.1_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES jsoncpp) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) + set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") endif (STANDALONE) |