X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FCMakeLists.txt;h=31a77f055c67d11bee72d106a49b9f18ebba684c;hb=92caef4ab9527cc610e45d51e6fde0d94a045088;hp=68c49b2c18fdb6fb6cb5d5284620ce8700d9a0c2;hpb=83d6c83bfcdfa88b7f322286136f802e89d5830c;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 68c49b2c..31a77f05 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,13 +42,17 @@ IF (GDCM_DATA_ROOT)
   )
   # add test that require VTK:
   IF(GDCM_VTK)
-    IF(${VTK_MAJOR_VERSION} LESS 4)
+    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)
+    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 4 AND ${VTK_BUILD_VERSION} LESS 3)
+      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})
 
@@ -61,7 +65,7 @@ IF (GDCM_DATA_ROOT)
         VTKTestWrite.cxx
         VTKTestWriteSeq.cxx
       )
-    ENDIF(${VTK_MAJOR_VERSION} LESS 4)
+    ENDIF("${VTK_MAJOR_VERSION}" LESS 4)
   ENDIF(GDCM_VTK)
 ENDIF (GDCM_DATA_ROOT)