diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
| commit | 7e3c32308c1f7d9e325fae55e7116b5fe3f460ca (patch) | |
| tree | fac07085cf1b416ef3fb240961913758ebf6b435 /indra/cmake/JsonCpp.cmake | |
| parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
| parent | 28eaade69b4b330db7a9dfea528cc4f0a3998841 (diff) | |
merge out 2.6.0 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..53801a5737 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.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) |