summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-30 13:55:53 -0400
committerOz Linden <oz@lindenlab.com>2012-05-30 13:55:53 -0400
commitf09bd7669fcf976edf82c3ce70b26ea044019c67 (patch)
treebfce61c5c323daad6c9ffd20c33e62678b15f3eb /indra/newview/CMakeLists.txt
parent589218ecd65af1e1027ffe717ed607493a5c2ca7 (diff)
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
merge up to 3.3.2-release
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r--indra/newview/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a45467324b..f8105f9a5a 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}