diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 13:52:53 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 13:52:53 -0500 |
| commit | 7d16a1959005ec7607a787f757a049d744fafb8e (patch) | |
| tree | 0edd3491ba75e4ce537bdc5e544b029b24922e04 /indra/cmake/JsonCpp.cmake | |
| parent | fb94ad7646b5c8a2eaa65e41b0b8b1679652d956 (diff) | |
| parent | b890f3cd55b21c62d2629c82336cd19e2750a760 (diff) | |
merge changes for 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..5e6672ecd4 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) elseif (LINUX) - set(JSONCPP_LIBRARIES jsoncpp) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) endif (STANDALONE) |