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

[clitk.git] / tests / CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 04a0b0aa44ff44f5f87be0437f2ffedf49d8bd00..0ad6b8575e4660e93ca988a4642aa433be4fe2c5 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,22 +3,11 @@ cmake_policy(SET CMP0005 NEW)
 
 #=========================================================
 # Data tests path
-
-OPTION(CLITK_DATA_PATH ${CMAKE_CURRENT_BINARY_DIR}/data)
-ADD_DEFINITIONS(-DCLITK_DATA_PATH=\"${CLITK_DATA_PATH}\")
-#=========================================================
+ADD_DEFINITIONS(-DCLITK_TEST_DATA_PATH=\"${CLITK_TEST_DATA_PATH}/\")
 #=========================================================
-# Get the data tests
-IF(WIN32)
-  SET(scriptExt bat)
-ELSE(UNIX)
-  SET(scriptExt sh)
-ENDIF()
-EXEC_PROGRAM(${CMAKE_CURRENT_SOURCE_DIR}/fetch_data_test.${scriptExt} ARGS ${CLITK_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})