ENH: Some minor enhance:

[gdcm.git] / Testing / CMakeLists.txt

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 42991cffc1fccc1f363be06c4689c9b1ba961ee5..68c49b2c18fdb6fb6cb5d5284620ce8700d9a0c2 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -13,9 +13,10 @@ SET(TEST_SOURCES
   TestHash.cxx
   TestTS.cxx
   TestVR.cxx
+  TestDictGroupName.cxx
   TestDict.cxx
   TestWriteSimple.cxx
-  TestSequence.cxx
+  TestImageSet.cxx
   TestDicomDirElement.cxx
   TestDicomString.cxx
 )
@@ -41,18 +42,26 @@ IF (GDCM_DATA_ROOT)
   )
   # add test that require VTK:
   IF(GDCM_VTK)
-    # Include the VTK library
-    INCLUDE(${VTK_USE_FILE})
-
-    INCLUDE_DIRECTORIES(
-      ${GDCM_SOURCE_DIR}/vtk/
-    )
-    SET(TEST_SOURCES ${TEST_SOURCES}
-      VTKTestRead.cxx
-      VTKTestReadSeq.cxx
-      VTKTestWrite.cxx
-      VTKTestWriteSeq.cxx
-    )
+    IF(${VTK_MAJOR_VERSION} LESS 4)
+      MESSAGE(FATAL_ERROR "This VTK version is not supported, you are on your own !")
+    ELSE(${VTK_MAJOR_VERSION} LESS 4)
+      IF(${VTK_MAJOR_VERSION} EQUAL 4 AND ${VTK_MINOR_VERSION} EQUAL 4 AND ${VTK_BUILD_VERSION} LESS 3)
+        MESSAGE(FATAL_ERROR "This VTK version is not supported, you are on your own !"
+                             "Although gdcm should compile fine. You just need to turn BUILD_TESTING:=OFF")
+      ENDIF(${VTK_MAJOR_VERSION} EQUAL 4 AND ${VTK_MINOR_VERSION} EQUAL 4 AND ${VTK_BUILD_VERSION} LESS 3)
+      # Include the VTK library since we know this is going to work
+      INCLUDE(${VTK_USE_FILE})
+
+      INCLUDE_DIRECTORIES(
+        ${GDCM_SOURCE_DIR}/vtk/
+      )
+      SET(TEST_SOURCES ${TEST_SOURCES}
+        VTKTestRead.cxx
+        VTKTestReadSeq.cxx
+        VTKTestWrite.cxx
+        VTKTestWriteSeq.cxx
+      )
+    ENDIF(${VTK_MAJOR_VERSION} LESS 4)
   ENDIF(GDCM_VTK)
 ENDIF (GDCM_DATA_ROOT)
 
@@ -147,6 +156,10 @@ SET(BLACK_LIST
   "D_CLUNIE_CT1_JLSL.dcm"
   "D_CLUNIE_CT1_J2KR.dcm"
   "D_CLUNIE_CT1_J2KI.dcm"
+  #Not a Dicom Image, but a RT Object
+  "RS2.16.124.113534.2.3.5.0.120040728.21342.353.12747_anonimized.dcm" 
+  #Dicom MPEG image
+  "ETIAM_video_002.dcm" 
   )
 
 # Add a special test that requires dciodvfy from dicom3tools
@@ -157,7 +170,8 @@ 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}")
+    ADD_TEST("DCIODVFY-INPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${filename}")
+    ADD_TEST("DCIODVFY-OUTPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${GDCM_DATA_ROOT}/BaselineDicom/${filename_temp}")
   ENDIF(DCIODVFY_FOUND)
   STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST})
   IF(NOT bad_dicom)