X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=48e2e508f2f503cd9698575b1b5e1f027f8a4bff;hb=5d0ffbee572f7703f3c54be1e5f9bd4a6f83f5da;hp=9e0aa193091a650abd9e0a0d8cb72fc5f11d43f9;hpb=3bb146cbeb1c778d5b35f39b5b18369296da0197;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e0aa193..48e2e508 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 #-----------------------------------------------------------------------------
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_MAJOR_VERSION 1)
-SET(GDCM_MINOR_VERSION 0)
-SET(GDCM_BUILD_VERSION 1)
+SET(GDCM_MINOR_VERSION 2)
+SET(GDCM_BUILD_VERSION 0)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
@@ -16,6 +16,12 @@ 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)
+OPTION(GDCM_LEGACY_SILENT "Silence all legacy code messages." OFF)
+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)
@@ -47,16 +53,14 @@ SET(GDCM_INCLUDE_DIRS
   )
 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_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}/Utilities/GDCMConfig.cmake @ONLY IMMEDIATE)
+               ${GDCM_BINARY_DIR}/GDCMConfig.cmake @ONLY IMMEDIATE)
 
 #-----------------------------------------------------------------------------
 # Test if compiler defines the pseudo-macro __FUNCTION__
@@ -124,8 +128,8 @@ INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
 TEST_BIG_ENDIAN(GDCM_WORDS_BIGENDIAN)
 
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+CHECK_INCLUDE_FILE("stdint.h"       CMAKE_HAVE_STDINT_H)
 IF(UNIX) #Avoid polluting Win32 cmakecache
-  CHECK_INCLUDE_FILE("stdint.h"       CMAKE_HAVE_STDINT_H)
   CHECK_INCLUDE_FILE("inttypes.h"     CMAKE_HAVE_INTTYPES_H)
 ENDIF(UNIX)
 
@@ -194,12 +198,15 @@ CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
 
 INSTALL_FILES(/include .h gdcmConfigure.h)
+INSTALL_FILES(/lib .cmake GDCMBuildSettings  GDCMConfig  GDCMLibraryDepends)
 
 #-----------------------------------------------------------------------------
 # Add the testing directories
 OPTION(BUILD_TESTING "Build testing." ON)
 
 IF(BUILD_TESTING)
+  CONFIGURE_FILE(${GDCM_SOURCE_DIR}/CMake/CTestCustom.ctest.in
+      ${GDCM_BINARY_DIR}/CMake/CTestCustom.ctest @ONLY)
   ENABLE_TESTING()
   INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
   MARK_AS_ADVANCED(DART_ROOT)