diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-19 11:40:11 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-19 11:40:11 -0500 |
| commit | c05ce7c310c6ba49a20258b806c6220c65961d61 (patch) | |
| tree | 6aee1a154828785481fbd57305a09d9e507bb6f5 /indra/cmake | |
| parent | 66ecfbb1067d796a5d7228172061c681edb2b337 (diff) | |
| parent | f0519e8c044bc8301a4b3170869206e3d4fab35c (diff) | |
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 96488360a4..7c686eff07 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) endif (STANDALONE) |