Update TODO, clean Test/CMakeLists when cmake 2.x comes out

diff --git a/TODO b/TODO
index 4a208ce45e71d7b454f77bb83f35f059fa87a870..3e57f3c55b22d10dd93c1bb7a148bcc84a06a5f1 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,7 +5,7 @@
   done by gdcmHeader to provide the user with heuristics above various
   values found in the header (the simplest form being to default a value).
 * vtk/vtkGdcmHeader.cxx: if speed becomes a concern some changes can
-  be made a the cost of memory consumption (refer to header of 
+  be made at the cost of memory consumption (refer to header of 
   vtk/vtkGdcmHeader.cxx)
 * Add a GetVersion() global function.
 * gdcmElValSet::SetElValueLengthByNumber IMNSHO should be trashed.
@@ -70,3 +70,5 @@
       a.write(output);
    }
 
+* use namespace for gdcm, to avoid problem when using enum with name like
+  'Unknow' on .Net, and LP on cygwin that cause problems

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index f2d3b68824f7529ba44fb36c86a5f66afa31953f..aaca9643149e5d0caa5e667df74851d5cc46d003 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -74,15 +74,22 @@ ENDFOREACH(file ${TEST_SOURCES})
 # We need to test the reading of all dicom images in the gdcmData directory
 # First parse this directory and extract all images
 
-# Since there is a bug in cmake 1.8.3, I'll have to do two separate globs
-FILE(GLOB GDCM_DATA_IMAGES_GLOB_ACR
-  "${GDCM_DATA_ROOT}/*.acr"
-  )
-FILE(GLOB GDCM_DATA_IMAGES_GLOB_DCM
-  "${GDCM_DATA_ROOT}/*.dcm"
-  )
-SET(GDCM_DATA_IMAGES_GLOB ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR})
-  
+IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
+  FILE(GLOB GDCM_DATA_IMAGES_GLOB
+    "${GDCM_DATA_ROOT}/*.acr"
+    "${GDCM_DATA_ROOT}/*.dcm"
+    )
+ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
+  # Since there is a bug in cmake 1.8.3, I'll have to do two separate globs
+  FILE(GLOB GDCM_DATA_IMAGES_GLOB_ACR
+    "${GDCM_DATA_ROOT}/*.acr"
+    )
+  FILE(GLOB GDCM_DATA_IMAGES_GLOB_DCM
+    "${GDCM_DATA_ROOT}/*.dcm"
+    )
+  SET(GDCM_DATA_IMAGES_GLOB ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR})
+ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
+
 # Black list of images known to break lots of readers (efilm, xmedcon ...):
 SET(BLACK_LIST
   "gdcm-JPEG-LossLessThoravision.dcm"