X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FCMakeLists.txt;h=42b6ba0822abc6523d41efb0b4c808436cd211ac;hb=7409414e04772fdb69056cfb8066f392c08014e1;hp=60b1e913443f399a90eb768f085f8be48ebbc363;hpb=c7ef171977e6b293b82661e8a00f1c21a95fbbf6;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 60b1e913..42b6ba08 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -8,13 +8,15 @@ 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
+  TestUtil.cxx
   TestBug.cxx
   TestHash.cxx
   TestTS.cxx
   TestVR.cxx
-  TestUtil.cxx
+  TestDicomDirElement.cxx
   TestDicomString.cxx
   TestDict.cxx
+  TestWriteSimple.cxx
 )
 
 # add tests that require data
@@ -25,9 +27,8 @@ IF (GDCM_DATA_ROOT)
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
     TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
     #TestChangeHeader.cxx
-    TestCopyDicom.cxx
-    TestCopyRescaleDicom.cxx
-    TestWriteSimple.cxx
+    TestCopyDicom.cxx                # includes generated gdcmDataImages.h 
+    TestCopyRescaleDicom.cxx         # includes generated gdcmDataImages.h 
     TestDicomDir.cxx                 # require DICOMDIR
     BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
     makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
@@ -42,9 +43,9 @@ IF (GDCM_DATA_ROOT)
       ${GDCM_SOURCE_DIR}/vtk/
       )
     SET(TEST_SOURCES ${TEST_SOURCES}
-      ShowDicom.cxx
-      ShowDicomSeq.cxx
-      TestWriteWithVTK.cxx
+      VTKTestRead.cxx
+      VTKTestReadSeq.cxx
+      VTKTestWrite.cxx
       )
   ENDIF(GDCM_VTK)
 ENDIF (GDCM_DATA_ROOT)
@@ -151,10 +152,17 @@ SET(BLACK_LIST
   "PET-cardio-Multiframe-Papyrus.dcm" 
   )
 
+
+# Add a special test that requires dciodvfy from dicom3tools
+INCLUDE(${GDCM_SOURCE_DIR}/FindDicom3Tools.cmake)
+
 # 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)
+  IF(DCIODVFY_FOUND)
+    ADD_TEST("Clunie-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${filename}")
+  ENDIF(DCIODVFY_FOUND)
   STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST})
   IF(NOT bad_dicom)
     SET(GDCM_DATA_IMAGES "${GDCM_DATA_IMAGES}\n\"${filename_temp}\",")