ENH: Getting closer to USE_GDCM_FILE

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35e7e4726f565d757ca9035e1e2d314589bc17a6..275610a9c9703601ec6f32869b1dff7ccd2540de 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,8 @@ CMAKE_EXPORT_BUILD_SETTINGS(${GDCM_BINARY_DIR}/GDCMBuildSettings.cmake)
 # For GDCM from build tree:
 SET(GDCM_USE_FILE ${GDCM_SOURCE_DIR}/GDCMUse.cmake)
 SET(GDCM_INCLUDE_DIRS
-  ${GDCM_BINARY_DIR}/src
+  ${GDCM_BINARY_DIR}/     #for gdcmConfigure.h
+  ${GDCM_SOURCE_DIR}/src  #for main gdcm include
   )
 SET(GDCM_LIBRARY_DIRS ${LIBRARY_OUTPUT_PATH})
 SET(GDCM_LIBRARY_DEPENDS_FILE ${GDCM_BINARY_DIR}/GDCMLibraryDepends.cmake)

diff --git a/GDCMConfig.cmake.in b/GDCMConfig.cmake.in
index 969c8b897a24df5eda5f93e9994b3a446b3f8373..0e895c4bf7f18cd560efa2a4726220febe7b7a67 100644 (file)
--- a/GDCMConfig.cmake.in
+++ b/GDCMConfig.cmake.in
@@ -8,6 +8,9 @@ SET(GDCM_USE_FILE "@GDCM_USE_FILE@")
 SET(GDCM_INCLUDE_DIRS "@GDCM_INCLUDE_DIRS@")
 SET(GDCM_LIBRARY_DIRS "@GDCM_LIBRARY_DIRS@")
 
+# The build settings file.
+SET(GDCM_BUILD_SETTINGS_FILE "@GDCM_BUILD_SETTINGS_FILE@")
+
 # The GDCM library dependencies.
 IF(NOT GDCM_NO_LIBRARY_DEPENDS)
   INCLUDE("@GDCM_LIBRARY_DEPENDS_FILE@")

diff --git a/GDCMUse.cmake b/GDCMUse.cmake
index c8c27629275446653eb9ee1674be2544f762f29f..515da0c596a82a174817bf13db1358886dd2b6d0 100644 (file)
--- a/GDCMUse.cmake
+++ b/GDCMUse.cmake
@@ -13,6 +13,10 @@ IF(GDCM_FOUND)
   #  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${VTK_REQUIRED_SHARED_LINKER_FLAGS}")
   #  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${VTK_REQUIRED_MODULE_LINKER_FLAGS}")
 
-  # Add include directories needed to use VTK.
+  # Add include directories needed to use GDCM
   INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIRS})
+
+  # Add link directories needed to use GDCM
+  LINK_DIRECTORIES(${GDCM_LIBRARY_DIRS})
+
 ENDIF(GDCM_FOUND)