Hope application can link against non-installed version of gdcm

diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index 385d5f48db6e31c517c6d5a64ab7ea9d3b1d6c24..5408f7351c337d6652be4d2b83607784bfbc3c75 100644 (file)
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -38,12 +38,21 @@ SET(GDCM_BUILD_SETTINGS_FILE_CONFIG
   ${GDCM_BINARY_DIR}/GDCMBuildSettings.cmake)
 
 # The library directories.
+# to be used against non installed library
+SET(GDCM_LIBRARY_DIRS ${LIBRARY_OUTPUT_PATH})
+
 SET(GDCM_LIBRARY_DIRS_CONFIG ${GDCM_LIBRARY_DIRS})
 
 # The runtime directories.
 SET(GDCM_RUNTIME_DIRS_CONFIG ${GDCM_RUNTIME_DIRS})
 
 # The include directories.
+# to be used against non installed library
+SET(GDCM_INCLUDE_PATH 
+   ${GDCM_SOURCE_DIR}/src
+   ${GDCM_SOURCE_DIR}/vtk
+   ${GDCM_BINARY_DIR})
+   
 SET(GDCM_INCLUDE_DIRS_CONFIG ${GDCM_INCLUDE_PATH})
 
 # The library dependencies file.

diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
index 97a45a1f12ba1eabca4940d40522fd68893de40c..1da32f3f1222d41faa84f59bc151cc776905990f 100644 (file)
--- a/Example/CMakeLists.txt
+++ b/Example/CMakeLists.txt
@@ -2,11 +2,11 @@
 INCLUDE_DIRECTORIES(\r
   ${GDCM_SOURCE_DIR}/src\r
   ${GDCM_BINARY_DIR}\r
-  ${GDCM_BINARY_DIR}/src  \r
+  ${GDCM_BINARY_DIR}/src\r
 )\r
 \r
 SET(EXAMPLE_SOURCES\r
-#names starting with 'ex' are examples  \r
+#names starting with 'ex' are examples\r
   #Txt2Mat\r
   exReadPapyrus\r
   exReadWriteFile\r
@@ -22,7 +22,7 @@ SET(EXAMPLE_SOURCES
   exSerieHelper\r
   exXCoherentFileSet\r
   exExtractDicomTags\r
-                \r
+\r
 #the following are utilities\r
   PrintDicomDir\r
   PrintFile\r

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 57ab3dadfa5629ec72f475ff08f3ba0893f54245..69586df257d337040e4eb3cba1273605f784ffee 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/10/25 14:08:10 $
-  Version:   $Revision: 1.355 $
+  Date:      $Date: 2006/11/08 17:06:36 $
+  Version:   $Revision: 1.356 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -2357,7 +2357,7 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem)
       //
       // --> Probabely normal, since we considered we never have 
       // to trust manufacturers.
-      // (we find very often 'Implicit VR' tag, 
+      // (we often find 'Implicit VR' tag, 
       // even when Transfer Syntax tells us it's Explicit ...
       
        // NEVER trust the meta elements!