X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=ba9f86f449b3d9ea1f8ac1be5112bc68603611fa;hb=f540ed5835e7b89478e6048a577d494c0e156f2a;hp=728923a4f4f0127b4c3741800e75e815cdc1114b;hpb=187506872b6e67d60ebbe8ada94834443dbb293a;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 728923a4..ba9f86f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,21 +1,16 @@
 PROJECT(GDCM)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 # okay in fact you need at least cmake 2.0.4 to get swig working properly
+# and you cannot use cmake 2.0.6 out of the box due to a bug (patched in debian package)
 
 #-----------------------------------------------------------------------------
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_MAJOR_VERSION 1)
 SET(GDCM_MINOR_VERSION 3)
-SET(GDCM_BUILD_VERSION 0)
+SET(GDCM_BUILD_VERSION 1)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
-#-----------------------------------------------------------------------------
-# datadir in CMake:
-SET(GDCM_DATA_DIR "/share/gdcm/" CACHE INTERNAL 
-  "Install location for data (relative to prefix).")
-MARK_AS_ADVANCED(GDCM_DATA_DIR)
-
 #-----------------------------------------------------------------------------
 # Provide compatibility options.
 OPTION(GDCM_LEGACY_REMOVE "Remove all legacy code completely." OFF)
@@ -24,43 +19,72 @@ MARK_AS_ADVANCED(GDCM_LEGACY_REMOVE GDCM_LEGACY_SILENT)
 
 #-----------------------------------------------------------------------------
 # Build shared lib by default
-OPTION(GDCM_BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
-SET(BUILD_SHARED_LIBS ${GDCM_BUILD_SHARED_LIBS})
+OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
+
+SET(GDCM_CMAKE_DIR "${GDCM_SOURCE_DIR}/Utilities/CMake")
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${GDCM_CMAKE_DIR}")
+
+SET(GDCM_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES})
 
 OPTION(GDCM_DEBUG "Turn verbosity of some statement ON." OFF)
 MARK_AS_ADVANCED(GDCM_DEBUG)
 
+# --------------------------------------------------------------------------
+# Install directories
+STRING(TOLOWER ${PROJECT_NAME} project_name)
+
+IF(NOT GDCM_INSTALL_BIN_DIR)
+  SET(GDCM_INSTALL_BIN_DIR "/bin")
+ENDIF(NOT GDCM_INSTALL_BIN_DIR)
+
+IF(NOT GDCM_INSTALL_LIB_DIR)
+  SET(GDCM_INSTALL_LIB_DIR "/lib/${project_name}")
+ENDIF(NOT GDCM_INSTALL_LIB_DIR)
+
+IF(NOT GDCM_INSTALL_DATA_DIR)
+  SET(GDCM_INSTALL_DATA_DIR "/share/${project_name}")
+ENDIF(NOT GDCM_INSTALL_DATA_DIR)
+
+IF(NOT GDCM_INSTALL_INCLUDE_DIR)
+  SET(GDCM_INSTALL_INCLUDE_DIR "/include/${project_name}")
+ENDIF(NOT GDCM_INSTALL_INCLUDE_DIR)
+
+IF(NOT GDCM_INSTALL_PACKAGE_DIR)
+  SET(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR})
+ENDIF(NOT GDCM_INSTALL_PACKAGE_DIR)
+
+IF(NOT GDCM_VTK_INSTALL_PACKAGE_DIR)
+  SET(GDCM_VTK_INSTALL_PACKAGE_DIR ${VTK_INSTALL_PACKAGE_DIR})
+ENDIF(NOT GDCM_VTK_INSTALL_PACKAGE_DIR)
+
+IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+  SET(GDCM_INSTALL_NO_DEVELOPMENT 0)
+ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+
+IF(NOT GDCM_INSTALL_NO_RUNTIME)
+  SET(GDCM_INSTALL_NO_RUNTIME 0)
+ENDIF(NOT GDCM_INSTALL_NO_RUNTIME)
+
+IF(NOT GDCM_INSTALL_NO_DOCUMENTATION)
+  SET(GDCM_INSTALL_NO_DOCUMENTATION 0)
+ENDIF(NOT GDCM_INSTALL_NO_DOCUMENTATION)
+
+SET(GDCM_INSTALL_NO_LIBRARIES)
+IF(GDCM_BUILD_SHARED_LIBS)
+  IF(GDCM_INSTALL_NO_RUNTIME AND GDCM_INSTALL_NO_DEVELOPMENT)
+    SET(GDCM_INSTALL_NO_LIBRARIES 1)
+  ENDIF(GDCM_INSTALL_NO_RUNTIME AND GDCM_INSTALL_NO_DEVELOPMENT)
+ELSE(GDCM_BUILD_SHARED_LIBS)
+  IF(GDCM_INSTALL_NO_DEVELOPMENT)
+    SET(GDCM_INSTALL_NO_LIBRARIES 1)
+  ENDIF(GDCM_INSTALL_NO_DEVELOPMENT)
+ENDIF(GDCM_BUILD_SHARED_LIBS)
+
 #-----------------------------------------------------------------------------
 SET (EXECUTABLE_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
 SET (LIBRARY_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
 MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
-#-----------------------------------------------------------------------------
-# Help outside projects link against gdcm
-
-EXPORT_LIBRARY_DEPENDENCIES(${GDCM_BINARY_DIR}/GDCMLibraryDepends.cmake)
-
-# Save the compiler settings so another project can import them.
-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)
 
 #-----------------------------------------------------------------------------
 # Test if compiler defines the pseudo-macro __FUNCTION__
@@ -130,7 +154,6 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
 )
 
 # Set the place for the public dictionary, must be set before gdcmConfigure.h
-#SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
 FIND_PATH(GDCM_PUB_DICT_PATH dicomV3.dic
   ${GDCM_SOURCE_DIR}/Dicts
   $ENV{PUB_DICT_PATH}
@@ -181,7 +204,7 @@ IF(UNIX) #Avoid polluting Win32 cmakecache
 ENDIF(UNIX)
 
 #-----------------------------------------------------------------------------
-# Test if os defines a lenght for sockaddr
+# Test if os defines a length for sockaddr
 # only doing the test when we have sys/socket
 IF( ${CMAKE_HAVE_SYS_SOCKET_H} )
   IF("HAVE_SA_LEN" MATCHES "^HAVE_SA_LEN$")
@@ -221,7 +244,6 @@ CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
 
 INSTALL_FILES(/include/gdcm .h gdcmConfigure.h)
-INSTALL_FILES(/lib .cmake GDCMBuildSettings  GDCMConfig  GDCMLibraryDepends)
 
 #-----------------------------------------------------------------------------
 # Add the testing directories
@@ -283,3 +305,8 @@ IF(GDCM_INSTALLER)
   SUBDIRS(Builder)
 ENDIF(GDCM_INSTALLER)
 
+# --------------------------------------------------------------------------
+# Configure the export configuration
+
+SUBDIRS(CMake)
+