diff options
| author | callum <none@none> | 2011-02-18 13:35:27 -0800 |
|---|---|---|
| committer | callum <none@none> | 2011-02-18 13:35:27 -0800 |
| commit | f086f3543de5c408ae9a8365288b52ec5bd0e6ba (patch) | |
| tree | e5c49f3b3e3a12570f250194c275d159ed6c5662 /indra/cmake | |
| parent | 14e09f9f799a5c0c660a28a6c0ae5b73a0d1dff8 (diff) | |
| parent | 09562e9e0a50ae28bf7510fb1c77e8c059f653a1 (diff) | |
Merge with head
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) |