summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAleric Inglewood <Aleric.Inglewood@gmail.com>2010-12-15 17:40:22 +0100
committerAleric Inglewood <Aleric.Inglewood@gmail.com>2010-12-15 17:40:22 +0100
commit0de05499eddd2afbd69b5f247d4cffdee448db19 (patch)
tree3ce9467464b859659454d6366dc8edbe1ccfbf98 /indra
parent429e0caf17427b7a1d78b667c1bb1dd107379bf4 (diff)
VWR-24247: develop.py configure still searches for the wrong header file when checking for Tut
The viewer code includes "tut/tut.hpp" everywhere, so that is what we should search for when determining an include path for this header. This just searches in the usual places, including the paths provided through CMAKE_INCLUDE_PATH, and will find tut/tut.hpp: exactly what we need.
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/FindTut.cmake7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/cmake/FindTut.cmake b/indra/cmake/FindTut.cmake
index b5d58f6396..c2a9f43053 100644
--- a/indra/cmake/FindTut.cmake
+++ b/indra/cmake/FindTut.cmake
@@ -3,12 +3,11 @@
# - Find Tut
# Find the Tut unit test framework includes and library
# This module defines
-# TUT_INCLUDE_DIR, where to find tut.h, etc.
+# TUT_INCLUDE_DIR, where to find tut/tut.hpp.
# TUT_FOUND, If false, do not try to use Tut.
-find_path(TUT_INCLUDE_DIR tut.h
- /usr/local/include/
- /usr/include
+find_path(TUT_INCLUDE_DIR tut/tut.hpp
+ NO_SYSTEM_ENVIRONMENT_PATH
)
if (TUT_INCLUDE_DIR)