From: jpr <jpr>
Date: Wed, 8 Nov 2006 17:06:35 +0000 (+0000)
Subject: Hope application can link against non-installed version of gdcm
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=073cc0a0bc30a811d3242e2435ad436f649171f9;p=gdcm.git

Hope application can link against non-installed version of gdcm
---

diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index 385d5f48..5408f735 100644
--- 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 97a45a1f..1da32f3f 100644
--- a/Example/CMakeLists.txt
+++ b/Example/CMakeLists.txt
@@ -2,11 +2,11 @@
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src
   ${GDCM_BINARY_DIR}
-  ${GDCM_BINARY_DIR}/src  
+  ${GDCM_BINARY_DIR}/src
 )
 
 SET(EXAMPLE_SOURCES
-#names starting with 'ex' are examples  
+#names starting with 'ex' are examples
   #Txt2Mat
   exReadPapyrus
   exReadWriteFile
@@ -22,7 +22,7 @@ SET(EXAMPLE_SOURCES
   exSerieHelper
   exXCoherentFileSet
   exExtractDicomTags
-                
+
 #the following are utilities
   PrintDicomDir
   PrintFile
diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 57ab3dad..69586df2 100644
--- 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!