diff options
author | Andrew A. de Laix <alain@lindenlab.com> | 2011-02-18 09:08:48 -0800 |
---|---|---|
committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-02-18 09:08:48 -0800 |
commit | 09562e9e0a50ae28bf7510fb1c77e8c059f653a1 (patch) | |
tree | f656383472b53cbebc772ce7687ba8333ae9dad4 /indra/cmake | |
parent | f6fd4ad220bdcb3b187b5e334bdb64345ba4bc37 (diff) | |
parent | ae1435e8ee63a7d0e6ada77303eb01802580ec8e (diff) |
merge max fixes from merov.
Diffstat (limited to 'indra/cmake')
-rw-r--r-- | indra/cmake/JsonCpp.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 5e6672ecd4..96488360a4 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,7 +14,7 @@ else (STANDALONE) debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) elseif (LINUX) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) endif (WINDOWS) |