Updates in testing

[clitk.git] / tests / CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1e5595b07cc56f4bea60ade0954faa05d3781c27..e15b097a4a7660dafa54b1cf983aee760684eb6a 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,15 +1,15 @@
 # Tests are organized to mirror the clitk directory tree. 
 # Eacho subdirectory has its own CMakeLists.txt with the compiling directives
 
-IF (BUILD_TESTING)
+IF (CLITK_BUILD_TESTING)
 
   set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/tests/bin)
 
   # default data path is searched in the project source tree
   FIND_PATH(CLITK_DATA_PATH data PATHS ${PROJECT_SOURCE_DIR})
-  IF (CLITK_DATA_PATH STREQUAL "CLITK_DATA_PATH-NOTFOUND")
-    MESSAGE(FATAL_ERROR "Data path must be given when tests are enabled.")
-  ENDIF (CLITK_DATA_PATH STREQUAL "CLITK_DATA_PATH-NOTFOUND")
+  IF (CLITK_DATA_PATH STREQUAL "CLITK_DATA_PATH-NOTFOUND" OR CLITK_DATA_PATH STREQUAL "")
+    MESSAGE("Data path must be given when tests are enabled.")
+  ENDIF (CLITK_DATA_PATH STREQUAL "CLITK_DATA_PATH-NOTFOUND" OR CLITK_DATA_PATH STREQUAL "")
 
   set(CLITK_DATA_PATH ${CLITK_DATA_PATH}/data)
   ADD_DEFINITIONS(-DCLITK_DATA_PATH='"${CLITK_DATA_PATH}"')
@@ -19,4 +19,4 @@ IF (BUILD_TESTING)
   #ADD_SUBDIRECTORY(registration)
   #ADD_SUBDIRECTORY(common)
 
-ENDIF(BUILD_TESTING)
+ENDIF(CLITK_BUILD_TESTING)