X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=5824e07ede56d578cc67cd32110460995beb6a74;hb=6efceb0f2d025e536c69ea4345a83555a059cfa6;hp=b63a646df2292ec6e2bf2cf24206a53a3a3dc54a;hpb=79f126d06fd384c26dd0fb7f4db6268ad9fe4458;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b63a646d..5824e07e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,19 +3,11 @@ 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 "${GDCM_VERSION_MAJOR}.${GDCM_VERSION_MINOR}")
-SET(GDCM_VERSION_FULL "${GDCM_VERSION}.${GDCM_VERSION_PATCH}")
-
-#-----------------------------------------------------------------------------
-# Output directories.
-SET (LIBRARY_OUTPUT_PATH ${GDCM_SOURCE_DIR}/lib CACHE PATH "Single output directory for building all libraries.")
-SET (EXECUTABLE_OUTPUT_PATH ${GDCM_SOURCE_DIR}/lib CACHE PATH "Single output directory for building all executables.")
-MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
-SET(GDCM_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}")
-SET(GDCM_EXECUTABLE_PATH "${EXECUTABLE_OUTPUT_PATH}")
+SET(GDCM_MAJOR_VERSION 0)
+SET(GDCM_MINOR_VERSION 4)
+SET(GDCM_BUILD_VERSION 1)
+SET(GDCM_VERSION 
+    "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
 #-----------------------------------------------------------------------------
 # datadir in CMake:
@@ -26,78 +18,99 @@ 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(
-#)
+OPTION(GDCM_DEBUG "Turn verbosity of some statement ON." OFF)
+MARK_AS_ADVANCED(GDCM_DEBUG)
+
+#-----------------------------------------------------------------------------
+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)
 
 #-----------------------------------------------------------------------------
 # Build directory on which many applications depend
 SUBDIRS(
   src
   Dicts
-  Test
 )
-
 #-----------------------------------------------------------------------------
-# Search VTK
-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)
+# Example subdir:
+
+OPTION(BUILD_EXAMPLES "Build GDCM examples." ON)
+IF(BUILD_EXAMPLES)
+  SUBDIRS(Example)
+ENDIF(BUILD_EXAMPLES)
 
 #-----------------------------------------------------------------------------
-# Search Python libs:
-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)
+# 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, must be set before gdcmConfigure.h
+SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
 
 #-----------------------------------------------------------------------------
-# Search Doxygen:
-FIND_PACKAGE(Doxygen)
-IF(DOXYGEN)
-  OPTION(GDCM_DOXYGEN "Build source documentation using doxygen." OFF)
-  # if doxygen enable
-  IF(GDCM_DOXYGEN)
-    SUBDIRS(Doc)
-  ENDIF(GDCM_DOXYGEN)
-ENDIF(DOXYGEN)
+# 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)
+
+CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
+               ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
+
+INSTALL_FILES(/include .h gdcmConfigure.h)
 
 #-----------------------------------------------------------------------------
-# Configure files with settings for use by the build.
+# Add the testing directories
+OPTION(BUILD_TESTING "Build testing." ON)
 
-# to be rewritten to include only the necessary
-#CONFIGURE_FILE(${GDCM_SOURCE_DIR}/UseGdcm.cmake.in 
-#               ${GDCM_BINARY_DIR}/UseGdcm.cmake COPYONLY IMMEDIATE)
+IF(BUILD_TESTING)
+  ENABLE_TESTING()
+  INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+  MARK_AS_ADVANCED(DART_ROOT)
+  SUBDIRS(Test)
+ENDIF(BUILD_TESTING)
 
 
 #-----------------------------------------------------------------------------
-# 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"`
+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)
+
+#-----------------------------------------------------------------------------
+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)
+