X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=141b9b50b658bb8ec03ca5f5bcb0d4cb439376f7;hb=b59e9f16e06afc854372454e8d816bdb8ec72ccf;hp=afd1704532377114b0b38992efc4f4b79345108a;hpb=adc8d5da8f5fd92da1cd74d2f6b2efaac14d8889;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afd17045..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,33 +20,11 @@ MARK_AS_ADVANCED(GDCM_DATA_DIR)
 OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
 SET(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 
-SET(CMAKE_CONFIGURATION_TYPES
-  Debug
-  Release
-)
-SET(CMAKE_BUILD_TYPE_INIT Debug)
-
-# Deals with problem on SunOS:
-# ostrstream vs. ostringstream
-
-#SET(GDCM_NO_ANSI_STRING_STREAM
-#  ${CMAKE_NO_ANSI_STRING_STREAM}
-#)
-#CONFIGURE_FILE(${GDCM_SOURCE_DIR}/src/gdcmCommon.h.in
-#               ${GDCM_BINARY_DIR}/src/gdcmCommon.h @ONLY IMMEDIATE)
 
 #-----------------------------------------------------------------------------
-# 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)
+#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)
 SET(GDCM_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}")
 SET(GDCM_EXECUTABLE_PATH "${EXECUTABLE_OUTPUT_PATH}")
 
@@ -58,6 +36,46 @@ SUBDIRS(
   Test
 )
 
+#-----------------------------------------------------------------------------
+# Adding GDCM_DATA_ROOT
+FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
+  ${GDCM_SOURCE_DIR}/../gdcmData 
+  $ENV{GDCM_DATA}
+  $ENV{PUB_DICT_PATH}/../../gdcmData
+)
+
+#-----------------------------------------------------------------------------
+# Set the place for the public dictionary
+SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
+
+# SunOS + old gcc fixes:
+INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
+IF(CMAKE_NO_ANSI_STRING_STREAM)
+  SET(GDCM_NO_ANSI_STRING_STREAM 1)
+ENDIF(CMAKE_NO_ANSI_STRING_STREAM)
+
+INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+CHECK_INCLUDE_FILE("stdint.h" CMAKE_HAVE_STDINT_H)
+
+IF(NOT CMAKE_HAVE_STDINT_H)
+  SET(GDCM_HAVE_NO_STDINT_H 1)
+ENDIF(NOT CMAKE_HAVE_STDINT_H)
+
+CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
+               ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
+
+INSTALL_FILES(/include .h gdcmConfigure.h)
+
+#-----------------------------------------------------------------------------
+# Add the testing directories
+OPTION(GDCM_BUILD_TESTING "Test the project" ON)
+IF(GDCM_BUILD_TESTING)
+  ENABLE_TESTING()
+  INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+  SUBDIRS(Test)
+ENDIF(GDCM_BUILD_TESTING)
+
+
 #-----------------------------------------------------------------------------
 OPTION(GDCM_VTK "Build VTK-GDCM Lib." OFF)
 IF(GDCM_VTK)
@@ -93,30 +111,3 @@ IF(GDCM_DOXYGEN)
   ENDIF(DOXYGEN)
 ENDIF(GDCM_DOXYGEN)
 
-#-----------------------------------------------------------------------------
-# Configure files with settings for use by the build.
-
-# to be rewritten to include only the necessary
-#CONFIGURE_FILE(${GDCM_SOURCE_DIR}/UseGdcm.cmake.in 
-#               ${GDCM_BINARY_DIR}/UseGdcm.cmake COPYONLY IMMEDIATE)
-
-
-#-----------------------------------------------------------------------------
-# Copy / paste from old m4 script:
-
-# EXTRA_DIST = \
-#	AUTHORS	\
-#	ChangeLog \
-#	COPYING \
-#	INSTALL \
-#	NEWS \
-#	README \
-#	TODO \
-#	gdcm.spec \
-#       gdcm.dsw
-
-#release:
-#	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
-
-#snapshot:
-#	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`