X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tests%2FCMakeLists.txt;h=1e5595b07cc56f4bea60ade0954faa05d3781c27;hb=22f9a65075ca86a805d06f3a1a65151150d570d3;hp=822aada61d2280047caca361b42c0488ed58cf78;hpb=39e22c039d0de25c4f1e1c60027e4351cb30e445;p=clitk.git

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
old mode 100755
new mode 100644
index 822aada..1e5595b
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,17 +1,22 @@
-# Add test apps and test executions to this part
-# Test apps are compiled as any other app in the
-# project. Test executions are run using "make test"
-#
+# Tests are organized to mirror the clitk directory tree. 
+# Eacho subdirectory has its own CMakeLists.txt with the compiling directives
+
 IF (BUILD_TESTING)
 
-  # clitkImageInfo
-  ADD_EXECUTABLE(clitkImageInfoTest tools/clitkImageInfoTest.cxx)
-  TARGET_LINK_LIBRARIES(clitkImageInfoTest ITKIO)
-  ADD_TEST(NAME clitkImageInfoTest COMMAND clitkImageInfoTest)
+  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")
+
+  set(CLITK_DATA_PATH ${CLITK_DATA_PATH}/data)
+  ADD_DEFINITIONS(-DCLITK_DATA_PATH='"${CLITK_DATA_PATH}"')
 
-  # clitkWriteDicomSeries
-  ADD_EXECUTABLE(clitkWriteDicomSeriesTest tools/clitkWriteDicomSeriesTest.cxx)
-  TARGET_LINK_LIBRARIES(clitkWriteDicomSeriesTest ITKIO)
-  ADD_TEST(NAME clitkWriteDicomSeriesTest COMMAND clitkWriteDicomSeriesTest)
+  ADD_SUBDIRECTORY(tools)
+  #ADD_SUBDIRECTORY(segmentation)
+  #ADD_SUBDIRECTORY(registration)
+  #ADD_SUBDIRECTORY(common)
 
-ENDIF(BUILD_TESTING)
\ No newline at end of file
+ENDIF(BUILD_TESTING)