From 7e30236ba0d7b114bfe941e97f4e55ebed57bb70 Mon Sep 17 00:00:00 2001 From: malaterre Date: Mon, 28 Feb 2005 19:27:10 +0000 Subject: [PATCH] ENH: Getting closer to USE_GDCM_FILE --- CMakeLists.txt | 3 ++- GDCMConfig.cmake.in | 3 +++ GDCMUse.cmake | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35e7e472..275610a9 100644 --- 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 969c8b89..0e895c4b 100644 --- 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 c8c27629..515da0c5 100644 --- 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) -- 2.45.1