X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FCMakeLists.txt;h=f2d3b68824f7529ba44fb36c86a5f66afa31953f;hb=7d8572bf6b911f746d4dc5389bb3270868957373;hp=11661d05ae2a1b3adbe507dc32eb3a4cb603a2cc;hpb=2943fda916fe14973cda2deddad3fc7dd6fc7d19;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 11661d05..f2d3b688 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -3,12 +3,12 @@
 
 SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
 
-SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmCxxTests)
+SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 
 # add test that does not require data:
 # They usally return if no argument is given
 SET(TEST_SOURCES
-  bug1.cxx
+  PrintBug.cxx
   dcm2acr.cxx
   hashtest.cxx
   testWrite.cxx
@@ -16,43 +16,89 @@ SET(TEST_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
-  testDicomDir.cxx    #require DICOMDIR
-# Disable makeDicomDir for now
-#  makeDicomDir.cxx    #require test.acr
-)
+  SET(TEST_SOURCES ${TEST_SOURCES}     
+    PrintHeader.cxx       #require test.acr
+    PrintDicomDir.cxx
+    pourFindTaggs.cxx
+    testChangeEntete.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 gdcmCxxTests.cxx ${TEST_SOURCES})
-ADD_EXECUTABLE(gdcmCxxTests ${Tests})
-TARGET_LINK_LIBRARIES(gdcmCxxTests gdcm)
+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 gdcmCxxTests.cxx)
+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(${TName} ${CXX_TEST_PATH}/gdcmCxxTests ${TName}
-#        -D ${VTK_DATA_ROOT}
-#        -T ${VTK_BINARY_DIR}/Testing/Temporary
-#        -V Baseline/gdcm/${TName}.png)
+#    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})
-    #ADD_TEST(${TName} ${CXX_TEST_PATH}/gdcmCxxTests ${TName}) 
 #  ENDIF (GDCM_DATA_ROOT)
 ENDFOREACH(file ${TEST_SOURCES})
 
+#-----------------------------------------------------------------------------
+
+# We need to test the reading of all dicom images in the gdcmData directory
+# First parse this directory and extract all images
 
+# 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})
+  
+# Black list of images known to break lots of readers (efilm, xmedcon ...):
+SET(BLACK_LIST
+  "gdcm-JPEG-LossLessThoravision.dcm"
+  )
 
+# 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}\",")
+  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" 
+  )