diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2012-04-24 11:24:11 -0400 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2012-04-24 11:24:11 -0400 |
| commit | 1b832eaa4b5cbb9be2a3c92643ba62794931d1d2 (patch) | |
| tree | 5489f4ceadbe97c751bb6e7b88512652794bab92 | |
| parent | 9b87cfbc9182d7ae059734e1d70c089dc1d304b8 (diff) | |
OPEN-54: correct JsonCpp include path
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 5a24c43d5a..04edfb4bea 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 499b00fb44..7ad73e5683 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 7e6ffb35c3..9aaefa9c6a 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} |