Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / tests / CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fcacae041d9ce5432b9f831754bdb18fe8a49951..0ad6b8575e4660e93ca988a4642aa433be4fe2c5 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,8 +1,13 @@
 cmake_policy(SET CMP0005 NEW)
 #=========================================================
+
+#=========================================================
+# Data tests path
+ADD_DEFINITIONS(-DCLITK_TEST_DATA_PATH=\"${CLITK_TEST_DATA_PATH}/\")
+#=========================================================
+#=========================================================
 # Google test macro
 macro(ADD_GOOGLE_TESTS executable)
-message(exe : ${executable})
   foreach ( source ${ARGN} )
     file(READ "${source}" contents)
     string(REGEX MATCHALL "TEST_?F?\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
@@ -18,11 +23,6 @@ SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/tests/bin)
 SET(BUILDNAME ${CMAKE_SYSTEM_NAME}${CMAKE_OSX_ARCHITECTURES} CACHE INTERNAL DOCSTRING)
 #=========================================================
 #=========================================================
-# Data tests path
-FIND_PATH(CLITK_DATA_PATH data)
-ADD_DEFINITIONS(-DCLITK_DATA_PATH=\"${CLITK_DATA_PATH}\")
-#=========================================================
-#=========================================================
 # GoogleTest framemwork
 FIND_PATH(GTEST_DIR gtest)
 INCLUDE_DIRECTORIES(${GTEST_DIR}/include/)