X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FCMakeLists.txt;h=c4815d87be1adeac133ae167fe02fe120a3b5df5;hb=8fbe1313f77680e9c313c23c8d4d6cc0150bd10c;hp=9e49ddfcec1331f85bf07c8529b4df341d76b777;hpb=d9f195b44e7bfee584fb53a10bc6342027ebbab4;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 9e49ddfc..c4815d87 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -1,52 +1,59 @@
-# 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
 
-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)
+SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
 
+SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmCxxTests)
 
+# add test that does not require data:
+# They usally return if no argument is given
 SET(TEST_SOURCES
-  PrintHeader.cxx
-  testWrite.cxx
-  testChangeEntete.cxx
-  hashtest.cxx
   bug1.cxx
-  pourFindTaggs.cxx
   dcm2acr.cxx
+  hashtest.cxx
+  testWrite.cxx
+)
+
+# 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
+  testDicomDir.cxx    #require DICOMDIR
+# Disable makeDicomDir for now
+  makeDicomDir.cxx    #require test.acr ?!? JPR
+  BuildUpDicomDir.cxx
 )
+ENDIF (GDCM_DATA_ROOT)
 
 # include stuff
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/
+  ${GDCM_BINARY_DIR}/
 )
 
-<<<<<<< CMakeLists.txt
-SET(dcm2acr_SOURCES
-  dcm2acr.cxx
-)
-ADD_EXECUTABLE(dcm2acr ${dcm2acr_SOURCES})
+CREATE_TEST_SOURCELIST(Tests gdcmCxxTests.cxx ${TEST_SOURCES})
+ADD_EXECUTABLE(gdcmCxxTests ${Tests})
+TARGET_LINK_LIBRARIES(gdcmCxxTests gdcm)
+SET (TestsToRun ${Tests})
+REMOVE (TestsToRun gdcmCxxTests.cxx)
 
-SET(explDICOMDIR_SOURCES
-  explDICOMDIR.cxx
-)
-ADD_EXECUTABLE(explDICOMDIR ${explDICOMDIR_SOURCES})
-=======
 # 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_EXECUTABLE(${name} ${file})
-  TARGET_LINK_LIBRARIES(${name} gdcm)
+#  IF (GDCM_DATA_ROOT)
+#    ADD_TEST(${TName} ${CXX_TEST_PATH}/gdcmCxxTests ${TName}
+#        -D ${VTK_DATA_ROOT}
+#        -T ${VTK_BINARY_DIR}/Testing/Temporary
+#        -V Baseline/gdcm/${TName}.png)
+#  ELSE (GDCM_DATA_ROOT)
+    ADD_TEST(${name} ${GDCM_TESTS} ${name})
+    #ADD_TEST(${TName} ${CXX_TEST_PATH}/gdcmCxxTests ${TName}) 
+#  ENDIF (GDCM_DATA_ROOT)
 ENDFOREACH(file ${TEST_SOURCES})
->>>>>>> 1.4
+
+
+
+