diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:23:13 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:23:13 -0500 |
| commit | 2e7461277801dc0daa1e9ea509e079c980045f42 (patch) | |
| tree | a514c1787cb8988b0b63c25beea1816ed5e5113f /indra/cmake/JsonCpp.cmake | |
| parent | 7aca14a77a706f12c22540f7f3a36ec4ee8d8402 (diff) | |
| parent | 2d268422deb1846da889e38100eae60b42c4d21c (diff) | |
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/cmake/JsonCpp.cmake')
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 96488360a4..66c1739ff4 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,9 +14,9 @@ else (STANDALONE) debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) + set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (STANDALONE) |