diff --git a/doc/contributions.txt b/doc/contributions.txt index 5a24c43d5a8b4dd425a7afc315ccc549c12682f0..04edfb4bea1a9857e1c875b3ccf4dd84c5d43ba2 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -234,7 +234,7 @@ Borg Capalini Boroondas Gupte OPEN-29 OPEN-39 - OPEN-39 + OPEN-54 OPEN-99 SNOW-278 SNOW-503 diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 499b00fb444328bfc46f2b2493a7de4b3216744d..7ad73e56830a50869ef90bd988db47240d06235b 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -18,5 +18,5 @@ else (STANDALONE) elseif (LINUX) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") + set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") endif (STANDALONE) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 7e6ffb35c3eb128d4f95528dded9df07bb340d37..9aaefa9c6ae8e1b74c49c2a069cce26cd3468bcf 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -47,7 +47,7 @@ include(CMakeCopyIfDifferent) include_directories( ${DBUSGLIB_INCLUDE_DIRS} - ${JSONCPP_INCLUDE_DIRS} + ${JSONCPP_INCLUDE_DIR} ${GLOD_INCLUDE_DIR} ${LLAUDIO_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS}