From: malaterre <malaterre>
Date: Thu, 29 Apr 2004 19:15:12 +0000 (+0000)
Subject: Remove complex style install stuff, was never used
X-Git-Tag: Version0.5.bp~220
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=30e1456055bb7338c2f182c20642d735a0cf72fb;p=gdcm.git

Remove complex style install stuff, was never used
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3ab0d5c..141b9b50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.8)
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_VERSION_MAJOR 0)
 SET(GDCM_VERSION_MINOR 4)
-SET(GDCM_VERSION_PATCH 0)
+SET(GDCM_VERSION_PATCH 1)
 SET(GDCM_VERSION "${GDCM_VERSION_MAJOR}.${GDCM_VERSION_MINOR}")
 SET(GDCM_VERSION_FULL "${GDCM_VERSION}.${GDCM_VERSION_PATCH}")
 
@@ -20,23 +20,8 @@ MARK_AS_ADVANCED(GDCM_DATA_DIR)
 OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
 SET(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 
-#-----------------------------------------------------------------------------
-# Does not work as of 2004/04/05
-#SET(CMAKE_CONFIGURATION_TYPES
-#  Debug
-#  Release
-#)
-#SET(CMAKE_BUILD_TYPE_INIT Debug)
 
 #-----------------------------------------------------------------------------
-# Output directories.
-#Put all stuff in one single dir for Win32, otherwise dll are a pain:
-#IF(WIN32 AND GDCM_BUILD_SHARED_LIBS)
-#  SET(OUTPUT_LIB_DIR ${GDCM_SOURCE_DIR}/bin)
-#ELSE(WIN32 AND GDCM_BUILD_SHARED_LIBS)
-#  SET(OUTPUT_LIB_DIR ${GDCM_SOURCE_DIR}/lib)
-#ENDIF(WIN32 AND GDCM_BUILD_SHARED_LIBS)
-
 #SET (EXECUTABLE_OUTPUT_PATH ${GDCM_SOURCE_DIR}/bin CACHE PATH "Single output directory for building all executables.")
 #SET (LIBRARY_OUTPUT_PATH ${OUTPUT_LIB_DIR} CACHE PATH "Single output directory for building all libraries.")
 #MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
@@ -60,20 +45,7 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
 )
 
 #-----------------------------------------------------------------------------
-# Deals with problem on SunOS:
-# ostrstream vs. ostringstream
-
-#-----------------------------------------------------------------------------
-# Why one should not use ADD_DEFINITIONS
-# http://www.cmake.org/pipermail/cmake/2003-September/004286.html
-
-#-----------------------------------------------------------------------------
-# __STDC_LIMIT_MACROS -> Refer to stdint.h
-# http://www.cmake.org/pipermail/cmake/2003-October/004369.html
-# http://www.cmake.org/pipermail/cmake/2003-October/004373.html
-
-#SET(GDCM_COMPILE_FLAGS  "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""  )
-
+# Set the place for the public dictionary
 SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
 
 # SunOS + old gcc fixes:
@@ -83,7 +55,7 @@ IF(CMAKE_NO_ANSI_STRING_STREAM)
 ENDIF(CMAKE_NO_ANSI_STRING_STREAM)
 
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-CHECK_INCLUDE_FILE("stdint.h"    CMAKE_HAVE_STDINT_H)
+CHECK_INCLUDE_FILE("stdint.h" CMAKE_HAVE_STDINT_H)
 
 IF(NOT CMAKE_HAVE_STDINT_H)
   SET(GDCM_HAVE_NO_STDINT_H 1)
@@ -139,34 +111,3 @@ IF(GDCM_DOXYGEN)
   ENDIF(DOXYGEN)
 ENDIF(GDCM_DOXYGEN)
 
-#-----------------------------------------------------------------------------
-# Configure files with settings for use by the build.
-# for third party to access gdcm through cmake
-# to be rewritten to include only the necessary
-
-CONFIGURE_FILE(
-  ${GDCM_SOURCE_DIR}/gdcmConfig.cmake.in 
-  ${GDCM_BINARY_DIR}/gdcmConfig.cmake @ONLY IMMEDIATE
-  )
-
-# Export our build settings and library
-# dependencies for the use by the user projects.
-INCLUDE(
-  ${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
-
-CMAKE_EXPORT_BUILD_SETTINGS(
-  ${GDCM_BINARY_DIR}/gdcmBuildSettings.cmake
-  )
-
-EXPORT_LIBRARY_DEPENDENCIES(
-  ${GDCM_BINARY_DIR}/gdcmLibraryDepends.cmake
-  )
-
-# Intall the packaging files for use by FIND_PACKAGE(GDCM) in user projects.
-INSTALL_FILES(/lin/gdcm FILES
-  ${GDCM_SOURCE_DIR}/gdcmUse.cmake
-  ${GDCM_BINARY_DIR}/gdcmConfig.cmake
-  ${GDCM_BINARY_DIR}/gdcmBuildSettings.cmake
-  ${GDCM_BINARY_DIR}/gdcmLibraryDepends.cmake
-  )
-
diff --git a/gdcmConfig.cmake.in b/gdcmConfig.cmake.in
deleted file mode 100644
index a89e7c8a..00000000
--- a/gdcmConfig.cmake.in
+++ /dev/null
@@ -1,34 +0,0 @@
-# Tell the user project where to find our headers and libraries
-
-SET(GDCM_INCLUDE_DIRS
-  #"@CMAKE_INSTALL_PREFIX@/include"
-  "@GDCM_SOURCE_DIR@/src"
-  "@GDCM_SOURCE_DIR@/vtk"
-  )
-
-SET(GDCM_LIBRARY_DIRS 
-  #"@CMAKE_INSTALL_PREFIX@/lib"
-  "@GDCM_LIBRARY_PATH@"
-  )
-
-# Tell the user project where to find your build
-# settings and library dependencies
-SET(GDCM_BUILD_SETTING_FILE
-#  "@CMAKE_INSTALL_PREFIX@/lib/gdcm/gdcmBuildSettings.cmake
-#  "@CMAKE_INSTALL_PREFIX@/lib/gdcmBuildSettings.cmake"
-  "@GDCM_BINARY_DIR@/gdcmBuildSettings.cmake"
-  )
-  
-INCLUDE(
-#  "@CMAKE_INSTALL_PREFIX@/lib/gdcm/gdcmLibraryDepends.cmake"
-#  "@CMAKE_INSTALL_PREFIX@/lib/gdcmLibraryDepends.cmake"
-  "@GDCM_BINARY_DIR@/gdcmLibraryDepends.cmake"
-  )
-
-# Tell the user project where to find the "USE" file.
-# This file uses the above settings to configure the user project.
-
-SET(GDCM_USE_FILE
-#  "@CMAKE_INSTALL_PREFIX@/lib/gdcm/gdcmUse.cmake"
-  "@GDCM_SOURCE_DIR@/gdcmUse.cmake"
-  )
diff --git a/gdcmUse.cmake b/gdcmUse.cmake
deleted file mode 100644
index 9ca4147f..00000000
--- a/gdcmUse.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# Import GDCM's build settings.
-
-INCLUDE(
-  ${CMAKE_ROOT}/Modules/CMake/CMAkeImportBuildSettings.cmake
-  )
-
-CMAKE_IMPORT_BUILD_SETTINGS(${GDCM_BUILD_SETTINGS_FILE})
-
-# Tell the compiler where to find GDCM's header files.
-INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIRS})
-
-# Tell the linker where to find GDCM's libraries.
-LINK_DIRECTORIES(${GDCM_LIBRARY_DIRS})