From: malaterre <malaterre>
Date: Fri, 5 May 2006 20:51:39 +0000 (+0000)
Subject: ENH: Some cleanups
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f233c4a2bb3cac97f90e30cb4ccad39782130732;p=gdcm.git

ENH: Some cleanups
---

diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index e0970553..385d5f48 100644
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -1,27 +1,245 @@
-#-----------------------------------------------------------------------------
-# Help outside projects link against gdcm
+# Generate the GDCMConfig.cmake file in the build tree. Also configure
+# one for installation. The file tells external projects how to use
+# GDCM.
+
+# Help store a literal dollar in a string.  CMake 2.2 allows escaped
+# dollars but we have to support CMake 2.0.
+SET(DOLLAR "$")
 
-EXPORT_LIBRARY_DEPENDENCIES(${GDCM_BINARY_DIR}/GDCMLibraryDepends.cmake)
+#-----------------------------------------------------------------------------
+# Settings shared between the build tree and install tree.
 
-# Save the compiler settings so another project can import them.
+EXPORT_LIBRARY_DEPENDENCIES(
+  ${GDCM_BINARY_DIR}/GDCMLibraryDepends.cmake)
 INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
-CMAKE_EXPORT_BUILD_SETTINGS(${GDCM_BINARY_DIR}/GDCMBuildSettings.cmake)
-#INSTALL_FILES(/lib/gdcm .cmake GDCMBuildSettings)
-
-# For GDCM from build tree:
-SET(GDCM_USE_FILE ${GDCM_SOURCE_DIR}/GDCMUse.cmake)
-SET(GDCM_INCLUDE_DIRS
-  ${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)
-
-# For installed GDCM:
-SET(GDCM_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib/GDCM-${GDCM_VERSION}/GDCMUse.cmake)
-SET(GDCM_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/GDCM-${GDCM_VERSION})
-SET(GDCM_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/lib/GDCM-${GDCM_VERSION})
-SET(GDCM_LIBRARY_DEPENDS_FILE ${CMAKE_INSTALL_PREFIX}/lib/GDCM-${GDCM_VERSION}/GDCMLibraryDepends.cmake)
-CONFIGURE_FILE(${GDCM_SOURCE_DIR}/GDCMConfig.cmake.in
-               ${GDCM_BINARY_DIR}/GDCMConfig.cmake @ONLY IMMEDIATE)
+CMAKE_EXPORT_BUILD_SETTINGS(
+  ${GDCM_BINARY_DIR}/GDCMBuildSettings.cmake)
+
+IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+  INSTALL_FILES(${GDCM_INSTALL_PACKAGE_DIR} FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/UseGDCM.cmake
+    ${GDCM_BINARY_DIR}/GDCMLibraryDepends.cmake
+    ${GDCM_BINARY_DIR}/GDCMBuildSettings.cmake
+    )
+ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+
+#-----------------------------------------------------------------------------
+# Settings specific to the build tree.
+
+# The install-only section is empty for the build tree.
+SET(GDCM_CONFIG_INSTALL_ONLY)
+
+# The "use" file.
+SET(GDCM_USE_FILE_CONFIG 
+  ${CMAKE_CURRENT_SOURCE_DIR}/UseGDCM.cmake)
+
+# The build settings file.
+SET(GDCM_BUILD_SETTINGS_FILE_CONFIG 
+  ${GDCM_BINARY_DIR}/GDCMBuildSettings.cmake)
+
+# The library directories.
+SET(GDCM_LIBRARY_DIRS_CONFIG ${GDCM_LIBRARY_DIRS})
+
+# The runtime directories.
+SET(GDCM_RUNTIME_DIRS_CONFIG ${GDCM_RUNTIME_DIRS})
+
+# The include directories.
+SET(GDCM_INCLUDE_DIRS_CONFIG ${GDCM_INCLUDE_PATH})
+
+# The library dependencies file.
+SET(GDCM_LIBRARY_DEPENDS_FILE 
+  ${GDCM_BINARY_DIR}/GDCMLibraryDepends.cmake)
+
+# The data dir.
+SET(GDCM_DATA_DIR_CONFIG
+  ${GDCM_DATA_DIR})
+
+# The examples dir.
+SET(GDCM_EXAMPLES_DIR_CONFIG 
+  ${GDCM_EXAMPLES_DIR})
+
+# The templates dir.
+#SET(GDCM_TEMPLATES_DIR_CONFIG 
+#  ${GDCM_TEMPLATES_DIR})
+
+# The resources dir.
+#SET(GDCM_RESOURCES_DIR_CONFIG 
+#  ${GDCM_RESOURCES_DIR})
+
+# The CMake macros dir.
+SET(GDCM_CMAKE_DIR_CONFIG 
+  ${GDCM_CMAKE_DIR})
+
+# The Tcl/Tk options.
+#SET(GDCM_TCL_PACKAGE_INDEX_DIR_CONFIG ${GDCM_TCL_PACKAGE_INDEX_DIR})
+
+# The Python options.
+SET(GDCM_PYTHON_MODULE_DIR_CONFIG ${GDCM_PYTHON_MODULE_DIR})
+
+# The Doxygen options.
+SET(GDCM_DOXYGEN_DIR_CONFIG ${GDCM_SOURCE_DIR}/Utilities/Doxygen)
+
+# The VTK options.
+SET(GDCM_VTK_DIR_CONFIG ${VTK_DIR})
+
+# The build configuration information.
+SET(GDCM_CONFIGURATION_TYPES_CONFIG ${GDCM_CONFIGURATION_TYPES})
+SET(GDCM_BUILD_TYPE_CONFIG ${CMAKE_BUILD_TYPE})
+
+# Configure GDCMConfig.cmake for the build tree.
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/GDCMConfig.cmake.in
+  ${GDCM_BINARY_DIR}/GDCMConfig.cmake @ONLY IMMEDIATE)
+
+#-----------------------------------------------------------------------------
+# Settings specific to the install tree.
+
+# The "use" file.
+SET(GDCM_USE_FILE_CONFIG 
+  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_PACKAGE_DIR}/UseGDCM.cmake)
+
+# The build settings file.
+SET(GDCM_BUILD_SETTINGS_FILE_CONFIG 
+  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_PACKAGE_DIR}/GDCMBuildSettings.cmake)
+
+# The library directories.
+IF(CYGWIN AND GDCM_BUILD_SHARED_LIBS)
+  # In Cygwin programs directly link to the .dll files.
+  SET(GDCM_LIBRARY_DIRS_CONFIG 
+    ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_BIN_DIR})
+ELSE(CYGWIN AND GDCM_BUILD_SHARED_LIBS)
+  SET(GDCM_LIBRARY_DIRS_CONFIG 
+    ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_LIB_DIR})
+ENDIF(CYGWIN AND GDCM_BUILD_SHARED_LIBS)
+
+# The runtime directories.
+IF(WIN32)
+  SET(GDCM_RUNTIME_DIRS_CONFIG 
+    ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_BIN_DIR})
+ELSE(WIN32)
+  SET(GDCM_RUNTIME_DIRS_CONFIG 
+    ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_LIB_DIR})
+ENDIF(WIN32)
+
+# The include directories.
+SET(GDCM_INCLUDE_DIRS_CONFIG
+  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_INCLUDE_DIR})
+
+# The library dependencies file.
+SET(GDCM_LIBRARY_DEPENDS_FILE 
+  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_PACKAGE_DIR}/GDCMLibraryDepends.cmake)
+
+# The data dir.
+SET(GDCM_DATA_DIR
+  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_DATA_DIR}/Data)
+
+# The examples dir.
+SET(GDCM_EXAMPLES_DIR_CONFIG 
+  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_DATA_DIR}/Examples)
+
+# The templates dir.
+#SET(GDCM_TEMPLATES_DIR_CONFIG 
+# ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_INCLUDE_DIR}/Templates)
+
+# The resources dir.
+#SET(GDCM_RESOURCES_DIR_CONFIG 
+#  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_DATA_DIR}/Resources)
+
+# The CMake macros dir.
+SET(GDCM_CMAKE_DIR_CONFIG 
+  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_PACKAGE_DIR}/CMake)
+
+# The Tcl/Tk options.
+#SET(GDCM_TCL_PACKAGE_INDEX_DIR_CONFIG 
+#  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_LIB_DIR}/tcl)
+
+# The Python options.
+#IF(WIN32)
+#  SET(python_subdir "")
+#ELSE(WIN32)
+#  IF(PYTHON_EXECUTABLE)
+#    EXEC_PROGRAM("${PYTHON_EXECUTABLE}" ARGS "-V" OUTPUT_VARIABLE version)
+#    STRING(REGEX REPLACE "^(Python )([0-9]\\.[0-9])(.*)$" "\\2" 
+#      major_minor "${version}")
+#    SET(python_subdir "python${major_minor}/")
+#  ELSE(PYTHON_EXECUTABLE)
+#    SET(python_subdir "python2.4/")
+#  ENDIF(PYTHON_EXECUTABLE)
+#ENDIF(WIN32)
+#SET(GDCM_PYTHON_MODULE_DIR_CONFIG 
+#  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_LIB_DIR}/../${python_subdir}site-packages)
+
+# The Doxygen options.
+SET(GDCM_DOXYGEN_DIR_CONFIG 
+  ${DOLLAR}{GDCM_INSTALL_PREFIX}${GDCM_INSTALL_DOXYGEN_DIR})
+
+# The VTK options.
+# If VTK_BINARY_DIR is set, then GDCM is part of a larger parent project
+# that also builds VTK. In that case, GDCM_VTK_INSTALL_PACKAGE_DIR
+# should be set to the value of VTK_INSTALL_PACKAGE_DIR. Otherwise, if not set,
+# then we are using an outside VTK whose location will not change when we
+# install.
+IF(VTK_BINARY_DIR)
+  IF(NOT GDCM_VTK_INSTALL_PACKAGE_DIR)
+    MESSAGE(
+      FATAL_ERROR 
+      "GDCM_VTK_INSTALL_PACKAGE_DIR must be set by the parent project to the value of VTK_INSTALL_PACKAGE_DIR it uses to configure VTK.")
+  ENDIF(NOT GDCM_VTK_INSTALL_PACKAGE_DIR)
+  SET(GDCM_VTK_DIR_CONFIG ${GDCM_VTK_INSTALL_PACKAGE_DIR})
+ELSE(VTK_BINARY_DIR)
+  SET(GDCM_VTK_DIR_CONFIG ${VTK_DIR})
+ENDIF(VTK_BINARY_DIR)
+
+# The build configuration information.
+# The install tree only has one configuration.
+SET(GDCM_CONFIGURATION_TYPES_CONFIG)
+
+# Configure GDCMConfig.cmake for the install tree.
+
+# Construct the proper number of GET_FILENAME_COMPONENT(... PATH)
+# calls to compute the installation prefix from GDCM_DIR.
+STRING(REGEX REPLACE "/" ";" GDCM_INSTALL_PACKAGE_DIR_COUNT
+  "${GDCM_INSTALL_PACKAGE_DIR}")
+SET(GDCM_CONFIG_INSTALL_ONLY "
+# Compute the installation prefix from GDCM_DIR.
+SET(GDCM_INSTALL_PREFIX \"${DOLLAR}{GDCM_DIR}\")
+")
+FOREACH(p ${GDCM_INSTALL_PACKAGE_DIR_COUNT})
+  SET(GDCM_CONFIG_INSTALL_ONLY
+    "${GDCM_CONFIG_INSTALL_ONLY}GET_FILENAME_COMPONENT(GDCM_INSTALL_PREFIX \"${DOLLAR}{GDCM_INSTALL_PREFIX}\" PATH)\n"
+    )
+ENDFOREACH(p)
+
+IF(CMAKE_CONFIGURATION_TYPES)
+  # There are multiple build configurations.  Configure one
+  # GDCMConfig.cmake for each configuration.
+  FOREACH(config ${CMAKE_CONFIGURATION_TYPES})
+    SET(GDCM_BUILD_TYPE_CONFIG ${config})
+    CONFIGURE_FILE(
+      ${CMAKE_CURRENT_SOURCE_DIR}/GDCMConfig.cmake.in
+      ${CMAKE_CURRENT_BINARY_DIR}/${config}/GDCMConfig.cmake
+      @ONLY IMMEDIATE)
+  ENDFOREACH(config)
+
+  # Install the config file corresponding to the build configuration
+  # specified when building the install target.  The BUILD_TYPE variable
+  # will be set while CMake is processing the install files.
+  IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+    INSTALL_FILES(${GDCM_INSTALL_PACKAGE_DIR} FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/${DOLLAR}{BUILD_TYPE}/GDCMConfig.cmake)
+  ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+ELSE(CMAKE_CONFIGURATION_TYPES)
+  # There is only one build configuration. Configure one GDCMConfig.cmake.
+  SET(GDCM_BUILD_TYPE_CONFIG ${CMAKE_BUILD_TYPE})
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/GDCMConfig.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/GDCMConfig.cmake @ONLY IMMEDIATE)
+
+  # Setup an install rule for the config file.
+  IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+    INSTALL_FILES(${GDCM_INSTALL_PACKAGE_DIR} FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/GDCMConfig.cmake)
+  ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+ENDIF(CMAKE_CONFIGURATION_TYPES)
+
 
diff --git a/CMake/GDCMConfig.cmake.in b/CMake/GDCMConfig.cmake.in
index d4e7d54b..dd7be933 100644
--- a/CMake/GDCMConfig.cmake.in
+++ b/CMake/GDCMConfig.cmake.in
@@ -1,117 +1,108 @@
 #-----------------------------------------------------------------------------
 #
-# KWWidgetsConfig.cmake - CMake configuration file for external projects.
+# GDCMConfig.cmake - CMake configuration file for external projects.
 #
-# This file is configured by KWWidgets and used by the UseKWWidgets.cmake 
-# module to load KWWidgets's settings for an external project.
-@KWWidgets_CONFIG_INSTALL_ONLY@
-# The KWWidgets version number.
-SET(KWWidgets_MAJOR_VERSION "@KWWidgets_MAJOR_VERSION@")
-SET(KWWidgets_MINOR_VERSION "@KWWidgets_MINOR_VERSION@")
+# This file is configured by GDCM and used by the UseGDCM.cmake 
+# module to load GDCM's settings for an external project.
+@GDCM_CONFIG_INSTALL_ONLY@
+# The GDCM version number.
+SET(GDCM_MAJOR_VERSION "@GDCM_MAJOR_VERSION@")
+SET(GDCM_MINOR_VERSION "@GDCM_MINOR_VERSION@")
+SET(GDCM_BUILD_VERSION "@GDCM_BUILD_VERSION@")
+SET(GDCM_VERSION       "@GDCM_VERSION@")
 
 # The libraries.
-SET(KWWidgets_LIBRARIES "@KWWidgets_LIBRARIES@")
+SET(GDCM_LIBRARIES "@GDCM_LIBRARIES@")
 
 # The list of available languages.
-SET(KWWidgets_LANGUAGES "TCL")
+#SET(GDCM_LANGUAGES "Python")
 
 # The CMake macros dir.
-SET(KWWidgets_CMAKE_DIR "@KWWidgets_CMAKE_DIR_CONFIG@")
+SET(GDCM_CMAKE_DIR "@GDCM_CMAKE_DIR_CONFIG@")
 
 # The configuration options.
-SET(KWWidgets_BUILD_SHARED_LIBS "@KWWidgets_BUILD_SHARED_LIBS@")
-SET(KWWidgets_USE_HTML_HELP "@KWWidgets_USE_HTML_HELP@")
-SET(KWWidgets_USE_INTERNATIONALIZATION "@KWWidgets_USE_INTERNATIONALIZATION@")
+SET(GDCM_BUILD_SHARED_LIBS "@GDCM_BUILD_SHARED_LIBS@")
+#SET(GDCM_USE_HTML_HELP "@GDCM_USE_HTML_HELP@")
 
 # The C and C++ flags added to the cmake-configured flags.
-SET(KWWidgets_REQUIRED_C_FLAGS 
-  "@KWWidgets_REQUIRED_C_FLAGS@")
-SET(KWWidgets_REQUIRED_CXX_FLAGS 
-  "@KWWidgets_REQUIRED_CXX_FLAGS@")
-SET(KWWidgets_REQUIRED_EXE_LINKER_FLAGS 
-  "@KWWidgets_REQUIRED_EXE_LINKER_FLAGS@")
-SET(KWWidgets_REQUIRED_SHARED_LINKER_FLAGS 
-  "@KWWidgets_REQUIRED_SHARED_LINKER_FLAGS@")
-SET(KWWidgets_REQUIRED_MODULE_LINKER_FLAGS 
-  "@KWWidgets_REQUIRED_MODULE_LINKER_FLAGS@")
+SET(GDCM_REQUIRED_C_FLAGS 
+  "@GDCM_REQUIRED_C_FLAGS@")
+SET(GDCM_REQUIRED_CXX_FLAGS 
+  "@GDCM_REQUIRED_CXX_FLAGS@")
+SET(GDCM_REQUIRED_EXE_LINKER_FLAGS 
+  "@GDCM_REQUIRED_EXE_LINKER_FLAGS@")
+SET(GDCM_REQUIRED_SHARED_LINKER_FLAGS 
+  "@GDCM_REQUIRED_SHARED_LINKER_FLAGS@")
+SET(GDCM_REQUIRED_MODULE_LINKER_FLAGS 
+  "@GDCM_REQUIRED_MODULE_LINKER_FLAGS@")
 
 # The "use" file.
-SET(KWWidgets_USE_FILE "@KWWidgets_USE_FILE_CONFIG@")
+SET(GDCM_USE_FILE "@GDCM_USE_FILE_CONFIG@")
 
 # The build settings file.
-SET(KWWidgets_BUILD_SETTINGS_FILE "@KWWidgets_BUILD_SETTINGS_FILE_CONFIG@")
+SET(GDCM_BUILD_SETTINGS_FILE "@GDCM_BUILD_SETTINGS_FILE_CONFIG@")
 
 # The library directories.
-SET(KWWidgets_LIBRARY_DIRS "@KWWidgets_LIBRARY_DIRS_CONFIG@")
+SET(GDCM_LIBRARY_DIRS "@GDCM_LIBRARY_DIRS_CONFIG@")
 
 # The runtime directories.
-# Note that if KWWidgets_CONFIGURATION_TYPES is set (see below) then
+# Note that if GDCM_CONFIGURATION_TYPES is set (see below) then
 # these directories will be the parent directories under which there will
 # be a directory of runtime binaries for each configuration type.
-SET(KWWidgets_RUNTIME_DIRS "@KWWidgets_RUNTIME_DIRS_CONFIG@")
+SET(GDCM_RUNTIME_DIRS "@GDCM_RUNTIME_DIRS_CONFIG@")
 
 # The include directories.
-SET(KWWidgets_INCLUDE_DIRS "@KWWidgets_INCLUDE_DIRS_CONFIG@")
+SET(GDCM_INCLUDE_DIRS "@GDCM_INCLUDE_DIRS_CONFIG@")
 
 # The library dependencies file.
-IF(NOT KWWidgets_NO_LIBRARY_DEPENDS)
-  INCLUDE("@KWWidgets_LIBRARY_DEPENDS_FILE@")
-ENDIF(NOT KWWidgets_NO_LIBRARY_DEPENDS)
+IF(NOT GDCM_NO_LIBRARY_DEPENDS)
+  INCLUDE("@GDCM_LIBRARY_DEPENDS_FILE@")
+ENDIF(NOT GDCM_NO_LIBRARY_DEPENDS)
 
-# The examples dir.
-SET(KWWidgets_EXAMPLES_DIR "@KWWidgets_EXAMPLES_DIR_CONFIG@")
+# The data dir.
+SET(GDCM_DATA_DIR "@GDCM_DATA_DIR@")
 
-# The templates dir.
-SET(KWWidgets_TEMPLATES_DIR "@KWWidgets_TEMPLATES_DIR_CONFIG@")
+# The examples dir.
+SET(GDCM_EXAMPLES_DIR "@GDCM_EXAMPLES_DIR_CONFIG@")
 
 # The resources dir.
-SET(KWWidgets_RESOURCES_DIR "@KWWidgets_RESOURCES_DIR_CONFIG@")
-SET(KWWidgets_RESOURCE_MAJOR_VERSION 
-  "@KWWidgets_RESOURCE_MAJOR_VERSION@")
-SET(KWWidgets_RESOURCE_MINOR_VERSION 
-  "@KWWidgets_RESOURCE_MINOR_VERSION@")
-SET(KWWidgets_RESOURCE_APPLICATION_NAME 
-  "@KWWidgets_RESOURCE_APPLICATION_NAME@")
-SET(KWWidgets_RESOURCE_FILE_NAME 
-  "@KWWidgets_RESOURCE_FILE_NAME@")
-SET(KWWidgets_RESOURCE_COMPANY_NAME 
-  "@KWWidgets_RESOURCE_COMPANY_NAME@")
+SET(GDCM_RESOURCES_DIR "@GDCM_RESOURCES_DIR_CONFIG@")
+SET(GDCM_RESOURCE_MAJOR_VERSION 
+  "@GDCM_RESOURCE_MAJOR_VERSION@")
+SET(GDCM_RESOURCE_MINOR_VERSION 
+  "@GDCM_RESOURCE_MINOR_VERSION@")
+SET(GDCM_RESOURCE_APPLICATION_NAME 
+  "@GDCM_RESOURCE_APPLICATION_NAME@")
+SET(GDCM_RESOURCE_FILE_NAME 
+  "@GDCM_RESOURCE_FILE_NAME@")
+SET(GDCM_RESOURCE_COMPANY_NAME 
+  "@GDCM_RESOURCE_COMPANY_NAME@")
 
 # The Tcl/Tk options.
-SET(KWWidgets_TCL_PACKAGE_INDEX_DIR 
-  "@KWWidgets_TCL_PACKAGE_INDEX_DIR_CONFIG@")
-
-# The Tcl/Tk options.
-SET(KWWidgets_TCL_PACKAGE_INDEX_DIR 
-  "@KWWidgets_TCL_PACKAGE_INDEX_DIR_CONFIG@")
+#SET(GDCM_TCL_PACKAGE_INDEX_DIR 
+#  "@GDCM_TCL_PACKAGE_INDEX_DIR_CONFIG@")
 
 # The Python options.
-SET(KWWidgets_PYTHON_MODULE_DIR
-  "@KWWidgets_PYTHON_MODULE_DIR_CONFIG@")
+SET(GDCM_PYTHON_MODULE_DIR
+  "@GDCM_PYTHON_MODULE_DIR_CONFIG@")
 
 # The Doxygen options.
-SET(KWWidgets_DOXYGEN_DIR "@KWWidgets_DOXYGEN_DIR_CONFIG@")
+SET(GDCM_DOXYGEN_DIR "@GDCM_DOXYGEN_DIR_CONFIG@")
 
 # The VTK options.
-SET(KWWidgets_VTK_DIR "@KWWidgets_VTK_DIR_CONFIG@")
-
-# The gettext library. This is only defined for build dirs to help projects
-# find the gettext library (it is safe to assume we are on the same machine;
-# we could not guarantee that if we are building against an installed 
-# KWWidgets though).
-SET(GETTEXT_SEARCH_PATH ${GETTEXT_SEARCH_PATH} "@GETTEXT_SEARCH_PATH_CONFIG@")
+SET(GDCM_VTK_DIR "@GDCM_VTK_DIR_CONFIG@")
 
 # An install tree always provides one build configuration.
 # A build tree may provide either one or multiple build
 # configurations depending on the CMake generator used. Since
 # this project can be used either from a build tree or an install tree it
 # is useful for outside projects to know the configurations available.
-# If this KWWidgetsConfig.cmake is in an install tree
-# KWWidgets_CONFIGURATION_TYPES will be empty and KWWidgets_BUILD_TYPE
+# If this GDCMConfig.cmake is in an install tree
+# GDCM_CONFIGURATION_TYPES will be empty and GDCM_BUILD_TYPE
 # will be set to the value of CMAKE_BUILD_TYPE used to build
-# KWWidgets. If KWWidgetsConfig.cmake is in a build tree
-# then KWWidgets_CONFIGURATION_TYPES and KWWidgets_BUILD_TYPE will
+# GDCM. If GDCMConfig.cmake is in a build tree
+# then GDCM_CONFIGURATION_TYPES and GDCM_BUILD_TYPE will
 # have values matching CMAKE_CONFIGURATION_TYPES and CMAKE_BUILD_TYPE
 # for that build tree (only one will ever be set).
-SET(KWWidgets_CONFIGURATION_TYPES @KWWidgets_CONFIGURATION_TYPES_CONFIG@)
-SET(KWWidgets_BUILD_TYPE @KWWidgets_BUILD_TYPE_CONFIG@)
+SET(GDCM_CONFIGURATION_TYPES @GDCM_CONFIGURATION_TYPES_CONFIG@)
+SET(GDCM_BUILD_TYPE @GDCM_BUILD_TYPE_CONFIG@)
diff --git a/CMake/UseGDCM.cmake b/CMake/UseGDCM.cmake
index 26ae8c73..ab7d385b 100644
--- a/CMake/UseGDCM.cmake
+++ b/CMake/UseGDCM.cmake
@@ -1,50 +1,50 @@
 #
-# This module is provided as KWWidgets_USE_FILE by KWWidgetsConfig.cmake.  
+# This module is provided as GDCM_USE_FILE by GDCMConfig.cmake.
 # It can be INCLUDEd in a project to load the needed compiler and linker
-# settings to use KWWidgets:
-#   FIND_PACKAGE(KWWidgets REQUIRED)
-#   INCLUDE(${KWWidgets_USE_FILE})
+# settings to use GDCM:
+#   FIND_PACKAGE(GDCM REQUIRED)
+#   INCLUDE(${GDCM_USE_FILE})
 #
 
-IF(NOT KWWidgets_USE_FILE_INCLUDED)
-  SET(KWWidgets_USE_FILE_INCLUDED 1)
+IF(NOT GDCM_USE_FILE_INCLUDED)
+  SET(GDCM_USE_FILE_INCLUDED 1)
 
-  # Load the compiler settings used for KWWidgets.
-  IF(KWWidgets_BUILD_SETTINGS_FILE)
+  # Load the compiler settings used for GDCM.
+  IF(GDCM_BUILD_SETTINGS_FILE)
     INCLUDE(${CMAKE_ROOT}/Modules/CMakeImportBuildSettings.cmake)
-    CMAKE_IMPORT_BUILD_SETTINGS(${KWWidgets_BUILD_SETTINGS_FILE})
-  ENDIF(KWWidgets_BUILD_SETTINGS_FILE)
-
-  # Add compiler flags needed to use KWWidgets.
-  SET(CMAKE_C_FLAGS 
-    "${CMAKE_C_FLAGS} ${KWWidgets_REQUIRED_C_FLAGS}")
-  SET(CMAKE_CXX_FLAGS 
-    "${CMAKE_CXX_FLAGS} ${KWWidgets_REQUIRED_CXX_FLAGS}")
-  SET(CMAKE_EXE_LINKER_FLAGS 
-    "${CMAKE_EXE_LINKER_FLAGS} ${KWWidgets_REQUIRED_EXE_LINKER_FLAGS}")
-  SET(CMAKE_SHARED_LINKER_FLAGS 
-    "${CMAKE_SHARED_LINKER_FLAGS} ${KWWidgets_REQUIRED_SHARED_LINKER_FLAGS}")
-  SET(CMAKE_MODULE_LINKER_FLAGS 
-    "${CMAKE_MODULE_LINKER_FLAGS} ${KWWidgets_REQUIRED_MODULE_LINKER_FLAGS}")
-
-  # Add include directories needed to use KWWidgets.
-  INCLUDE_DIRECTORIES(${KWWidgets_INCLUDE_DIRS})
-
-  # Add link directories needed to use KWWidgets.
-  LINK_DIRECTORIES(${KWWidgets_LIBRARY_DIRS})
+    CMAKE_IMPORT_BUILD_SETTINGS(${GDCM_BUILD_SETTINGS_FILE})
+  ENDIF(GDCM_BUILD_SETTINGS_FILE)
+
+  # Add compiler flags needed to use GDCM.
+  SET(CMAKE_C_FLAGS
+    "${CMAKE_C_FLAGS} ${GDCM_REQUIRED_C_FLAGS}")
+  SET(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} ${GDCM_REQUIRED_CXX_FLAGS}")
+  SET(CMAKE_EXE_LINKER_FLAGS
+    "${CMAKE_EXE_LINKER_FLAGS} ${GDCM_REQUIRED_EXE_LINKER_FLAGS}")
+  SET(CMAKE_SHARED_LINKER_FLAGS
+    "${CMAKE_SHARED_LINKER_FLAGS} ${GDCM_REQUIRED_SHARED_LINKER_FLAGS}")
+  SET(CMAKE_MODULE_LINKER_FLAGS
+    "${CMAKE_MODULE_LINKER_FLAGS} ${GDCM_REQUIRED_MODULE_LINKER_FLAGS}")
+
+  # Add include directories needed to use GDCM.
+  INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIRS})
+
+  # Add link directories needed to use GDCM.
+  LINK_DIRECTORIES(${GDCM_LIBRARY_DIRS})
 
   # Add cmake module path.
-  SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${KWWidgets_CMAKE_DIR}")
+  SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${GDCM_CMAKE_DIR}")
 
   # Use VTK.
-  IF(NOT KWWidgets_NO_USE_VTK)
-    SET(VTK_DIR ${KWWidgets_VTK_DIR})
+  IF(NOT GDCM_NO_USE_VTK)
+    SET(VTK_DIR ${GDCM_VTK_DIR})
     FIND_PACKAGE(VTK)
     IF(VTK_FOUND)
       INCLUDE(${VTK_USE_FILE})
     ELSE(VTK_FOUND)
-      MESSAGE("VTK not found in KWWidgets_VTK_DIR=\"${KWWidgets_VTK_DIR}\".")
+      MESSAGE("VTK not found in GDCM_VTK_DIR=\"${GDCM_VTK_DIR}\".")
     ENDIF(VTK_FOUND)
-  ENDIF(NOT KWWidgets_NO_USE_VTK)
+  ENDIF(NOT GDCM_NO_USE_VTK)
 
-ENDIF(NOT KWWidgets_USE_FILE_INCLUDED)
+ENDIF(NOT GDCM_USE_FILE_INCLUDED)