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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de9c55b0006aa0f489a39da99e1a281bdf0cfc3f..ea1eb4728e6daccea44fcb8140191e72de16d31b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,11 +99,12 @@ ENDIF(CLITK_BUILD_VV)
 
 #=========================================================
 #Support for the CTest dashboard testing system
-INCLUDE(CTest)
+OPTION(CLITK_BUILD_TESTING "Build the testing tree" OFF)
 #=========================================================
-IF (BUILD_TESTING)
+IF (CLITK_BUILD_TESTING)
+  ENABLE_TESTING()
   ADD_SUBDIRECTORY(tests)
-ENDIF(BUILD_TESTING)
+ENDIF(CLITK_BUILD_TESTING)
 #=========================================================
 
 

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)

diff --git a/tests/tools/CMakeLists.txt b/tests/tools/CMakeLists.txt
index f915a5bbd177f9ac52a77fe724be2b51385b9e02..950194e4b0d9d898c538e3ff7135eea12dac97f3 100644 (file)
--- a/tests/tools/CMakeLists.txt
+++ b/tests/tools/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Test apps are compiled as any other app in the
 # project. Test executions are run using "make test"
 #
-IF(BUILD_TESTING)
+IF(CLITK_BUILD_TESTING)
 
   # clitkImageInfo
   ADD_EXECUTABLE(clitkImageInfoTest clitkImageInfoTest.cxx)
@@ -14,4 +14,4 @@ IF(BUILD_TESTING)
   TARGET_LINK_LIBRARIES(clitkWriteDicomSeriesTest ITKIO)
   ADD_TEST(NAME clitkWriteDicomSeriesTest COMMAND clitkWriteDicomSeriesTest)
 
-ENDIF(BUILD_TESTING)
+ENDIF(CLITK_BUILD_TESTING)