diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-18 16:47:43 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-18 16:47:43 -0700 |
| commit | 8468670583db601c5feb683de6b27caf74744e45 (patch) | |
| tree | 8be9b029c9709b69d74c0f013f2ae51deece2a66 /indra/cmake | |
| parent | 9923f403226d6c014cb40149c2e31b2fce988803 (diff) | |
Autobuild : Fix merge snaffu in Json cmake file
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 53801a5737..499b00fb44 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_darwin_libmt.a) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) elseif (LINUX) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) endif (WINDOWS) |