summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-04 12:44:22 -0400
committerOz Linden <oz@lindenlab.com>2012-05-04 12:44:22 -0400
commita7454671b4ad27d55bdb0f0dd50efac8499ae72f (patch)
tree5db4b7ddb22e0f4d1ece67147f88205dfda6e3fd /indra/newview
parent63e51c586ff360f40d1efc849d2fac74d2b4ec7d (diff)
parent79a24d5d51365e992524691e96ad914c4cf8beef (diff)
merge changes for drtvwr-140
Diffstat (limited to 'indra/newview')
-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 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}