X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=29d27646e2a8886bac38aebea69eafa3ef1da0a7;hb=1aad11d86fa8d683d4f1a38b6f0483444e67f217;hp=c273c1d508d4be997e21dce06a6e1c37d55e85a3;hpb=7b90a94638699fec1143d1928f6a6b6f3c769d54;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index c273c1d5..29d27646 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -1,41 +1,60 @@
-#For later : rewrite this things for more consistencies, such as a 'FOREACH'
+# CMakeLists for Testing purpose
+# Cxx file that need a file to run should be place aproprietly
 
-LINK_LIBRARIES(gdcm)
-INCLUDE_DIRECTORIES(
-  ${GDCM_SOURCE_DIR}/src/
-)
+SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
 
-SET(PrintHeader_SOURCES
-  PrintHeader.cxx
-)
-ADD_EXECUTABLE(PrintHeader ${PrintHeader_SOURCES})
+SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 
-SET(testWrite_SOURCES
+# add test that does not require data:
+# They usally return if no argument is given
+SET(TEST_SOURCES
+  bug1.cxx
+  dcm2acr.cxx
+  hashtest.cxx
   testWrite.cxx
 )
-ADD_EXECUTABLE(testWrite ${testWrite_SOURCES})
 
-SET(testChangeEntete_SOURCES
+# add tests that require data
+IF (GDCM_DATA_ROOT)
+SET(TEST_SOURCES ${TEST_SOURCES}     
+  PrintHeader.cxx     #require test.acr
+  PrintDicomDir.cxx
+  pourFindTaggs.cxx
   testChangeEntete.cxx
-)
-ADD_EXECUTABLE(testChangeEntete ${testChangeEntete_SOURCES})
+  testDicomDir.cxx    #require DICOMDIR
+  BuildUpDicomDir.cxx
+  TestReadWrite.cxx
 
-SET(hashtest_SOURCES
-  hashtest.cxx
+# Disable makeDicomDir for now
+#  makeDicomDir.cxx
 )
-ADD_EXECUTABLE(hashtest ${hashtest_SOURCES})
+ENDIF (GDCM_DATA_ROOT)
 
-SET(bug1_SOURCES
-  bug1.cxx
+# include stuff
+INCLUDE_DIRECTORIES(
+  ${GDCM_SOURCE_DIR}/src/
+  ${GDCM_BINARY_DIR}/
 )
-ADD_EXECUTABLE(bug1 ${bug1_SOURCES})
 
-SET(pourFindTaggs_SOURCES
-  pourFindTaggs.cxx
-)
-ADD_EXECUTABLE(pourFindTaggs ${pourFindTaggs_SOURCES})
+CREATE_TEST_SOURCELIST(Tests gdcmTests.cxx ${TEST_SOURCES})
+ADD_EXECUTABLE(gdcmTests ${Tests})
+TARGET_LINK_LIBRARIES(gdcmTests gdcm)
+SET (TestsToRun ${Tests})
+REMOVE (TestsToRun gdcmTests.cxx)
+
+# Loop over files and create executables
+FOREACH(file ${TEST_SOURCES})
+  GET_FILENAME_COMPONENT(name ${file} NAME_WE)
+#  IF (GDCM_DATA_ROOT)
+#    ADD_TEST(${name} ${CXX_TEST_PATH}/gdcmTests ${name}
+#        -D ${GDCM_DATA_ROOT}
+#        -T ${GDCM_BINARY_DIR}/Testing/Temporary
+#        -V Baseline/gdcm/${name}.png)
+#  ELSE (GDCM_DATA_ROOT)
+    ADD_TEST(${name} ${GDCM_TESTS} ${name})
+#  ENDIF (GDCM_DATA_ROOT)
+ENDFOREACH(file ${TEST_SOURCES})
+
+
+
 
-SET(dcm2acr_SOURCES
-  dcm2acr.cxx
-)
-ADD_EXECUTABLE(dcm2acr ${dcm2acr_SOURCES})