X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=4546410e822684ec5ef25324df3b02e33fa52c50;hb=28251959a2edc4c25d1bfa569e8980d0b199a6b3;hp=1475af9b3d8caca6f8710565bc5d2419ad1c38c6;hpb=37fd1bd483d69af97351da7ccbd9ed7912fbaa75;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1475af9b..4546410e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 
 #-----------------------------------------------------------------------------
 # GDCM version number, usefull for packaging and doxygen doc:
-SET(GDCM_MAJOR_VERSION 0)
-SET(GDCM_MINOR_VERSION 7)
+SET(GDCM_MAJOR_VERSION 1)
+SET(GDCM_MINOR_VERSION 0)
 SET(GDCM_BUILD_VERSION 0)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
@@ -17,7 +17,8 @@ MARK_AS_ADVANCED(GDCM_DATA_DIR)
 
 #-----------------------------------------------------------------------------
 # Build shared lib by default
-OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
+OPTION(GDCM_BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
+SET(BUILD_SHARED_LIBS ${GDCM_BUILD_SHARED_LIBS})
 
 OPTION(GDCM_DEBUG "Turn verbosity of some statement ON." OFF)
 MARK_AS_ADVANCED(GDCM_DEBUG)
@@ -27,6 +28,29 @@ SET (EXECUTABLE_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output dir
 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)
+
+# For GDCM from build tree:
+SET(GDCM_USE_FILE ${GDCM_SOURCE_DIR}/GDCMUse.cmake)
+SET(GDCM_INCLUDE_DIRS
+  ${GDCM_BINARY_DIR}/src
+  )
+SET(GDCM_LIBRARY_DIRS ${LIBRARY_OUTPUT_PATH})
+SET(GDCM_LIBRARY_DEPENDS_FILE ${GDCM_BINARY_DIR}/GDCMLibraryDepends.cmake)
+CONFIGURE_FILE(${GDCM_SOURCE_DIR}/GDCMConfig.cmake.in
+               ${GDCM_BINARY_DIR}/GDCMConfig.cmake @ONLY IMMEDIATE)
+
+# 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/ExodusII-${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}/Utilities/GDCMConfig.cmake @ONLY IMMEDIATE)
+
 #-----------------------------------------------------------------------------
 # Test if compiler defines the pseudo-macro __FUNCTION__
 IF("GDCM_COMPILER_HAS_FUNCTION" MATCHES "^GDCM_COMPILER_HAS_FUNCTION$")
@@ -37,7 +61,7 @@ IF("GDCM_COMPILER_HAS_FUNCTION" MATCHES "^GDCM_COMPILER_HAS_FUNCTION$")
               OUTPUT_VARIABLE OUTPUT)
   IF(GDCM_COMPILER_HAS_FUNCTION)
     MESSAGE(STATUS "Checking support for __FUNCTION__ -- yes")
-    SET(GDCM_COMPILER_HAS_FUNCTION 1 CACHE INTERNAL "Support for extention C __FUNCTION__")
+    SET(GDCM_COMPILER_HAS_FUNCTION 1 CACHE INTERNAL "Support for extension C __FUNCTION__")
     WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeOutput.log
       "Determining if the C compiler supports __FUNCTION__ "
       "passed with the following output:\n"
@@ -144,7 +168,7 @@ CHECK_INCLUDE_FILE_CONCAT("net/if_arp.h"   CMAKE_HAVE_NET_IF_ARP_H)
 
 #-----------------------------------------------------------------------------
 # Force Big Endian emulation on little endian:
-OPTION(GDCM_FORCE_BIGENDIAN_EMULATION "Force Big Endian Emulation." OFF)
+OPTION(GDCM_FORCE_BIGENDIAN_EMULATION "Force Big Endian Emulation. Do use if you don't know what you are doing." OFF)
 
 CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)