summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorAleric Inglewood <Aleric.Inglewood@gmail.com>2010-12-16 15:43:18 +0100
committerAleric Inglewood <Aleric.Inglewood@gmail.com>2010-12-16 15:43:18 +0100
commita9021607235444c7b660985fdc35094c9782060f (patch)
tree9816e72c3e8842e7096736ac06520c6034007174 /indra/test
parent85446c8cf1da95d0119e0b643144f2959bfa2088 (diff)
VWR-24251: Fix -DLL_TESTS:BOOL=ON on standalone when Tut is installed in a non-standard directory.
If tut/tut.hpp isn't installed in a standard include directory all tests fail because the found include directory for tut isn't passed to the compiler. This patch fixes this by passing it. Note that using include_directories() in a Find*.cmake file is bad practise. The correct way is to set an include dir variable and call include_directories() once. It certainly doesn't work for the tests anyway because the tests are all over the place and include_directories is on a per folder basis. What is needed is to set it for each (test) target. However, there is no TARGET_INCLUDE_DIRECTORIES. The closest thing that we have is to set the COMPILE_FLAGS property for a target. Fortunately, standalone is only used for linux, so we can just use -I${TUT_INCLUDE_DIR} to get the effect we want.
Diffstat (limited to 'indra/test')
-rw-r--r--indra/test/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 66c78a86c4..e9eb3c1884 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -27,6 +27,7 @@ include_directories(
${LLXML_INCLUDE_DIRS}
${LSCRIPT_INCLUDE_DIRS}
${GOOGLEMOCK_INCLUDE_DIRS}
+ ${TUT_INCLUDE_DIR}
)
set(test_SOURCE_FILES