diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-14 22:52:11 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-14 22:52:11 -0700 |
| commit | 35b61cdd44a9195a5174a8bd22e96e6b404f42bc (patch) | |
| tree | 8fa3c0e0e055d2995b86c212105ed5910392c320 /indra/cmake/JsonCpp.cmake | |
| parent | ab27883b7ec6e3affde28ab061654adb264526c7 (diff) | |
| parent | 72d1febadb5f254eb7199bd26eb04a7553a6e55d (diff) | |
Pull from 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 66c1739ff4..9024fa92a7 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_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) + set(JSONCPP_LIBRARIES libjsoncpp.a) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") endif (STANDALONE) |