X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=9bf969e28f4cccc05e138e5d07913a4000a179b9;hb=74fccf1190246de80a78735ce73b783c488d1113;hp=2b40cf5d979f785836197f54b50d26be29598800;hpb=7b90a94638699fec1143d1928f6a6b6f3c769d54;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b40cf5d..9bf969e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,66 +1,114 @@
 PROJECT(GDCM)
-CMAKE_MINIMUM_REQUIRED(VERSION 1.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 1.8)
 
-# The GDCM version number.
-SET(GDCM_VERSION_MAJOR 1)
-SET(GDCM_VERSION_MINOR 9)
-SET(GDCM_VERSION_PATCH 0)
+#-----------------------------------------------------------------------------
+# GDCM version number, usefull for packaging and doxygen doc:
+SET(GDCM_VERSION_MAJOR 0)
+SET(GDCM_VERSION_MINOR 4)
+SET(GDCM_VERSION_PATCH 1)
 SET(GDCM_VERSION "${GDCM_VERSION_MAJOR}.${GDCM_VERSION_MINOR}")
 SET(GDCM_VERSION_FULL "${GDCM_VERSION}.${GDCM_VERSION_PATCH}")
 
-SET(GDCM_DATA_DIR "/share/gdcm" CACHE STRING 
+#-----------------------------------------------------------------------------
+# datadir in CMake:
+SET(GDCM_DATA_DIR "/share/gdcm/" CACHE INTERNAL 
   "Install location for data (relative to prefix).")
 MARK_AS_ADVANCED(GDCM_DATA_DIR)
 
-
+#-----------------------------------------------------------------------------
+# Build shared lib by default
 OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
 SET(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 
-INCLUDE_DIRECTORIES(
+
+#-----------------------------------------------------------------------------
+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)
+#SET(GDCM_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}")
+#SET(GDCM_EXECUTABLE_PATH "${EXECUTABLE_OUTPUT_PATH}")
+
+#-----------------------------------------------------------------------------
+# Build directory on which many applications depend
+SUBDIRS(
+  src
+  Dicts
+  Test
+  Example
+)
+
+#-----------------------------------------------------------------------------
+# 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
 )
 
-#Build directory on which many applications depend
-SUBDIRS(src
-        Test
-        Dicts)
+#-----------------------------------------------------------------------------
+# Set the place for the public dictionary
+SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
 
-FIND_PACKAGE(VTK)
-#If vtk found
-IF(VTK_FOUND)
-  OPTION(GDCM_VTK "Build VTK-GDCM Lib." OFF)
-  IF(GDCM_VTK)
-    INCLUDE(${VTK_USE_FILE})
-    SUBDIRS(vtk)
-  ENDIF(GDCM_VTK)
-ENDIF(VTK_FOUND)
-
-FIND_PACKAGE(PythonLibs)
-#If PythonLibs found
-IF(PYTHON_LIBRARY)
-  OPTION(GDCM_WRAP_PYTHON "Wrap GDCM classes into the Python language." OFF)
-  #if wrapping enable
-  IF(GDCM_WRAP_PYTHON)
-    SUBDIRS(gdcmPython)
-  ENDIF(GDCM_WRAP_PYTHON)
-ENDIF(PYTHON_LIBRARY)
+# 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)
 
-#Doxygen stuff
-#  SUBDIRS(Doc)
+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)
 
-# EXTRA_DIST = \
-#	AUTHORS	\
-#	ChangeLog \
-#	COPYING \
-#	INSTALL \
-#	NEWS \
-#	README \
-#	TODO \
-#	gdcm.spec \
-#  gdcm.dsw
+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)
+  # Search VTK
+  FIND_PACKAGE(VTK)
+  # If vtk found
+  IF(VTK_FOUND)
+    INCLUDE(${VTK_USE_FILE})
+    SUBDIRS(vtk)
+  ENDIF(VTK_FOUND)
+ENDIF(GDCM_VTK)
+
+#-----------------------------------------------------------------------------
+OPTION(GDCM_WRAP_PYTHON "Wrap GDCM classes into the Python language." OFF)
+#if wrapping enable
+IF(GDCM_WRAP_PYTHON)
+  # Search Python libs:
+  FIND_PACKAGE(PythonLibs)
+  # If PythonLibs found
+  IF(PYTHON_LIBRARY)
+    SUBDIRS(gdcmPython)
+  ENDIF(PYTHON_LIBRARY)
+ENDIF(GDCM_WRAP_PYTHON)
 
-#release:
-#	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
+#-----------------------------------------------------------------------------
+OPTION(GDCM_DOXYGEN "Build source documentation using doxygen." OFF)
+# if doxygen enable
+IF(GDCM_DOXYGEN)
+  # Search Doxygen:
+  FIND_PACKAGE(Doxygen)
+  IF(DOXYGEN)
+    SUBDIRS(Doc)
+  ENDIF(DOXYGEN)
+ENDIF(GDCM_DOXYGEN)
 
-#snapshot:
-#	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`