X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=29d27646e2a8886bac38aebea69eafa3ef1da0a7;hb=1da135b970b886808d3eb3868c49d0bd02fc486f;hp=9ff25734e48687a6d69b69fa276e7f8d1baaa658;hpb=46c9c13ea7d5b2a2fec304f12b3db77c8028caea;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 9ff25734..29d27646 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -1,57 +1,60 @@
-# TODO:
-# http://www.cmake.org/pipermail/cmake/2001-November/002491.html
-# So that dll is copied to each subdir where needed
+# CMakeLists for Testing purpose
+# Cxx file that need a file to run should be place aproprietly
 
 SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
 
 SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-CHECK_INCLUDE_FILE("stdint.h"    CMAKE_HAVE_STDINT_H)
-
-IF(NOT CMAKE_HAVE_STDINT_H)
-  SET(GDCM_TEST_COMPILE_FLAGS "-DHAVE_NO_STDINT_H")
-ENDIF(NOT CMAKE_HAVE_STDINT_H)
-
-
+# add test that does not require data:
+# They usally return if no argument is given
 SET(TEST_SOURCES
-  PrintHeader.cxx #require test.acr
-  bug1.cxx        #require test.acr
-  dcm2acr.cxx     #require test.acr
+  bug1.cxx
+  dcm2acr.cxx
   hashtest.cxx
-  makeDicomDir.cxx
-  testDicomDir.cxx
   testWrite.cxx
 )
+
+# add tests that require data
 IF (GDCM_DATA_ROOT)
-	# add tests that require data
-	SET(TEST_SOURCES ${TEST_SOURCES}     
-	  PrintDicomDir.cxx
-    pourFindTaggs.cxx
-    testChangeEntete.cxx
-  )
+SET(TEST_SOURCES ${TEST_SOURCES}     
+  PrintHeader.cxx     #require test.acr
+  PrintDicomDir.cxx
+  pourFindTaggs.cxx
+  testChangeEntete.cxx
+  testDicomDir.cxx    #require DICOMDIR
+  BuildUpDicomDir.cxx
+  TestReadWrite.cxx
+
+# Disable makeDicomDir for now
+#  makeDicomDir.cxx
+)
 ENDIF (GDCM_DATA_ROOT)
 
 # include stuff
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/
+  ${GDCM_BINARY_DIR}/
 )
 
+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})
-  #Doh ! I need to specify each time the compile flags !
-  IF(GDCM_TEST_COMPILE_FLAGS)
-  SET_SOURCE_FILES_PROPERTIES(${file}
-    PROPERTIES
-    COMPILE_FLAGS ${GDCM_TEST_COMPILE_FLAGS}
-  )
-  ENDIF(GDCM_TEST_COMPILE_FLAGS)
   GET_FILENAME_COMPONENT(name ${file} NAME_WE)
-  ADD_TEST(${name} ${GDCM_TESTS} ${name})
+#  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})
 
 
-ADD_EXECUTABLE(gdcmTests gdcmTests.cxx ${TEST_SOURCES})
-TARGET_LINK_LIBRARIES(gdcmTests gdcm)