Adding a GDCM_DATA_ROOT for testing

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ada9b14e5bdbc8fe418706252dd63295e9387c1..ddb8a4001e02ddfb7a47a7a4c97534d72cdd341a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,20 +20,13 @@ MARK_AS_ADVANCED(GDCM_DATA_DIR)
 OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)\r
 SET(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})\r
 \r
-SET(CMAKE_CONFIGURATION_TYPES\r
-  Debug\r
-  Release\r
-)\r
-SET(CMAKE_BUILD_TYPE_INIT Debug)\r
-\r
-# Deals with problem on SunOS:\r
-# ostrstream vs. ostringstream\r
-\r
-#SET(GDCM_NO_ANSI_STRING_STREAM\r
-#  ${CMAKE_NO_ANSI_STRING_STREAM}\r
+#-----------------------------------------------------------------------------\r
+# Does not work as of 2004/04/05\r
+#SET(CMAKE_CONFIGURATION_TYPES\r
+#  Debug\r
+#  Release\r
 #)\r
-#CONFIGURE_FILE(${GDCM_SOURCE_DIR}/src/gdcmCommon.h.in\r
-#               ${GDCM_BINARY_DIR}/src/gdcmCommon.h @ONLY IMMEDIATE)\r
+#SET(CMAKE_BUILD_TYPE_INIT Debug)\r
 \r
 #-----------------------------------------------------------------------------\r
 # Output directories.\r
@@ -66,6 +59,16 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
        $ENV{PUB_DICT_PATH}/../../gdcmData\r
 )\r
 \r
+#-----------------------------------------------------------------------------\r
+# Deals with problem on SunOS:\r
+# ostrstream vs. ostringstream\r
+\r
+#SET(GDCM_NO_ANSI_STRING_STREAM\r
+#  ${CMAKE_NO_ANSI_STRING_STREAM}\r
+#)\r
+CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in\r
+               ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)\r
+\r
 #-----------------------------------------------------------------------------\r
 # Add the testing directories\r
 OPTION(GDCM_BUILD_TESTING "Test the project" ON)\r

diff --git a/ChangeLog b/ChangeLog
index b514df3f0e6b95c1ae4b745b8a5d57c0b5fa28da..d2c05cab593b1be0df176525b76e9be59d1d7e84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2004-04-25  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
+     * ENH: Adding a GDCM_DATA_ROOT for testing
+
 2004-04-25  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
      * ENH: Adding automatic testing
        1. Need a DartConfig.cmake to submit to public

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 9ff25734e48687a6d69b69fa276e7f8d1baaa658..f722013e4396f85c1fda339afac168b7e6db00a1 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -35,6 +35,7 @@ ENDIF (GDCM_DATA_ROOT)
 # include stuff
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/
+  ${GDCM_BINARY_DIR}/
 )
 
 # Loop over files and create executables

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index 9dbbf7a3631f47cf62a589b5c9f551ade847bdf4..a84d3b96b301e2a0f6aec53333f091b60f7ff4cc 100644 (file)
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -69,6 +69,7 @@ int testChangeEntete(int argc, char* argv[]) {
 
        sprintf(resultat, "%s.vol", deuxieme.c_str());
        printf ("WriteDCM\n");
+  //f1->WriteDcmExplVR("itk-gdcm-ex.dcm");
        //f1->WriteDcmImplVR(resultat); 
        f1->WriteAcr(resultat); 
 

diff --git a/gdcmConfigure.h.in b/gdcmConfigure.h.in
new file mode 100644 (file)
index 0000000..ad1abfd
--- /dev/null
+++ b/gdcmConfigure.h.in
@@ -0,0 +1 @@
+#define GDCM_DATA_ROOT "@GDCM_DATA_ROOT@"