summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorAlain Linden <alain@lindenlab.com>2011-01-31 15:56:40 -0800
committerAlain Linden <alain@lindenlab.com>2011-01-31 15:56:40 -0800
commit3f78394f42ecf1f41edd926e0d1ba87c793330ae (patch)
tree94717af239ef405bf5154eb723aac5c8416a8939 /indra/cmake
parent8adcaa147de9e8dabaf6e64fbd8af0ccc61c4519 (diff)
parent48bf6b19b36a3ff3f5b3d440d511a0e3dba3d768 (diff)
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/JsonCpp.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index d878f70a17..4a129d7115 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.3.2_libmt)
endif (WINDOWS)
- set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp)
+ set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json)
endif (STANDALONE)