X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=f6dba28301b968d46e704d059dfbd6d04c664284;hb=fdd74c5c2b43621f24a1f22430a04224983aa09f;hp=f722013e4396f85c1fda339afac168b7e6db00a1;hpb=0aefbe64c65acfed527a7f18b352a2621f4bc92b;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index f722013e..f6dba283 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -1,58 +1,123 @@
-# 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
-  hashtest.cxx
-  makeDicomDir.cxx
-  testDicomDir.cxx
-  testWrite.cxx
+  TestBug.cxx
+  TestDcm2Acr.cxx
+  TestHash.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
+    PrintDocument.cxx     #require test.acr
+    PrintDicomDir.cxx
+    TestFindTags.cxx
+    TestChangeHeader.cxx
+    TestDicomDir.cxx      #require DICOMDIR
+    BuildUpDicomDir.cxx
+    TestReadWrite.cxx
+    makeDicomDir.cxx
   )
+  # add test that require VTK:
+  IF(GDCM_VTK)
+    INCLUDE_DIRECTORIES(
+      ${GDCM_SOURCE_DIR}/vtk/
+      )
+    SET(TEST_SOURCES ${TEST_SOURCES}
+      ShowDicom.cxx    
+      )
+  ENDIF(GDCM_VTK)
 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})
+IF(GDCM_VTK)
+  TARGET_LINK_LIBRARIES(gdcmTests vtkgdcm vtkRendering)
+ELSE(GDCM_VTK)
+  TARGET_LINK_LIBRARIES(gdcmTests gdcm)
+ENDIF(GDCM_VTK)
+
+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} ${GDCM_TESTS} ${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)
+# We need to test the reading of all dicom images in the gdcmData directory
+# First parse this directory and extract all images
 
+IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
+  FILE(GLOB GDCM_DATA_IMAGES_GLOB
+    "${GDCM_DATA_ROOT}/*.acr"
+    "${GDCM_DATA_ROOT}/*.dcm"
+    )
+ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
+  # Since there is a bug in cmake 1.8.3, I'll have to do two separate globs
+  FILE(GLOB GDCM_DATA_IMAGES_GLOB_ACR
+    "${GDCM_DATA_ROOT}/*.acr"
+    )
+  FILE(GLOB GDCM_DATA_IMAGES_GLOB_DCM
+    "${GDCM_DATA_ROOT}/*.dcm"
+    )
+  SET(GDCM_DATA_IMAGES_GLOB ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR})
+  #SET(GDCM_DATA_IMAGES_GLOB  ${GDCM_DATA_IMAGES_GLOB_ACR})
+ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
+
+# Black list of images known to break lots of readers (efilm, xmedcon ...):
+SET(BLACK_LIST
+  "gdcm-JPEG-LossLessThoravision.dcm"
+  "cr172241.dcm"  #temporarily remove as it kills my gnome session (but not kde)
+  "emptyImage.dcm"  #the png looks ugly...
+  "gdcm-MR-PHILIPS-16-Multi-Seq.fixed.dcm" weird looks exactly the same as gdcm-MR-PHILIPS-16-Multi-Seq.dcm
+  "gdcm-MR-PHILIPS-16.dcm" png looks ugly
+  "irmPhlipsNew1.dcm" png looks ugly
+  "mriThruVPRO.dcm"   png looks ugly
+  "US.3405.1.dcm" looks exactly the same as US.1.2.dcm
+  )
 
+#   gdcm-ACR-LibIDO seems to be cut
+#   test.acr is very bright
+
+# This is a GLOB expression, change it into a list separated with a comma and \n
+SET(GDCM_DATA_IMAGES)
+FOREACH(filename ${GDCM_DATA_IMAGES_GLOB})
+  GET_FILENAME_COMPONENT(filename_temp ${filename} NAME)
+  STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST})
+  IF(NOT bad_dicom)
+    SET(GDCM_DATA_IMAGES "${GDCM_DATA_IMAGES}\n\"${filename_temp}\",")
+  ENDIF(NOT bad_dicom)
+ENDFOREACH(filename)
+
+# Populate GDCM_DATA_IMAGES:
+FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataImages.h"
+  "const char * const gdcmDataImages[] = { ${GDCM_DATA_IMAGES}\n0 };\n" 
+  )