* src/gdcmFile.cxx, gdcmHeader.cxx : bug fix for the msvc compilation

[gdcm.git] / Testing / CMakeLists.txt

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index b4e41de2c26c55ad41fba94a9453dad992d47fb2..f2d3b68824f7529ba44fb36c86a5f66afa31953f 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -78,37 +78,27 @@ ENDFOREACH(file ${TEST_SOURCES})
 FILE(GLOB GDCM_DATA_IMAGES_GLOB_ACR
   "${GDCM_DATA_ROOT}/*.acr"
   )
-
 FILE(GLOB GDCM_DATA_IMAGES_GLOB_DCM
   "${GDCM_DATA_ROOT}/*.dcm"
   )
-
-# Black list of images know to break lots of readers (efilm, xmedcon ...):
+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"
   )
 
-SET(GDCM_DATA_IMAGES_GLOB ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR})
-  
 # 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)
-  #MESSAGE(STATUS ${filename_temp})
-  STRING(COMPARE EQUAL ${BLACK_LIST} ${filename_temp} bad_dicom)
-  #MESSAGE(STATUS ${bad_dicom})
+  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.in"
-  "const char * const gdcmDataImages[] = { @GDCM_DATA_IMAGES@ \n 0 };" 
-  )
-
-# Generate the header file:
-CONFIGURE_FILE(
-  ${GDCM_BINARY_DIR}/gdcmDataImages.h.in
-  ${GDCM_BINARY_DIR}/gdcmDataImages.h
+FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataImages.h"
+  "const char * const gdcmDataImages[] = { ${GDCM_DATA_IMAGES}\n0 };\n" 
   )