X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FCMakeLists.txt;h=3af8bd5732b8564f5be9527beb5eab7ed2723337;hb=7ab6ec3467d07f22144e60f63f357ffd9cf2e484;hp=ac8b9df56505cc012eba9aefeb3c04e6206e900b;hpb=0ce6682a82eacb85233fcccef601f83bb591ec12;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index ac8b9df5..3af8bd57 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -27,13 +27,13 @@ IF (GDCM_DATA_ROOT)
     TestFileAccessors.cxx
     TestMakeIcon.cxx
     TestPrintAllDocument.cxx         # includes generated gdcmDataImages.h
-    TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
+    #TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
     TestReadWriteReadCompare.cxx     # includes generated gdcmDataImages.h 
     #TestCopyDicom.cxx                # includes generated gdcmDataImages.h 
-    TestCopyRescaleDicom.cxx         # includes generated gdcmDataImages.h 
+    #    TestCopyRescaleDicom.cxx         # includes generated gdcmDataImages.h 
     #TestChangeHeader.cxx
-    TestAnonymize.cxx
+    #    TestAnonymize.cxx
     TestDirList.cxx
     TestDicomDir.cxx                 # require DICOMDIR
     TestBuildUpDicomDir.cxx          # writes a file named "NewDICOMDIR"
@@ -42,18 +42,30 @@ 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 2)
+        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 2)
+      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)
 
@@ -146,8 +158,6 @@ SET(BLACK_LIST
   # From David Clunie's Compresion Dataset  
   "D_CLUNIE_CT1_JLSN.dcm"
   "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