From: malaterre <malaterre>
Date: Sat, 15 May 2004 19:24:44 +0000 (+0000)
Subject: Update TODO, clean Test/CMakeLists when cmake 2.x comes out
X-Git-Tag: Version0.5.bp~174
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9a8932b74aab77d55d7b478b1996611c7d588daa;p=gdcm.git

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

diff --git a/TODO b/TODO
index 4a208ce4..3e57f3c5 100644
--- 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 f2d3b688..aaca9643 100644
--- 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"