X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=5824e07ede56d578cc67cd32110460995beb6a74;hb=14900333988858a95935ec735224433cf308c21c;hp=6889cca46931cf24c0cdc7bdbaf4ed0e2dd71a27;hpb=1da135b970b886808d3eb3868c49d0bd02fc486f;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6889cca4..5824e07e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +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 1)
-SET(GDCM_VERSION "${GDCM_VERSION_MAJOR}.${GDCM_VERSION_MINOR}")
-SET(GDCM_VERSION_FULL "${GDCM_VERSION}.${GDCM_VERSION_PATCH}")
+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:
@@ -18,23 +18,28 @@ 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})
 
+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)
-#SET(GDCM_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}")
-#SET(GDCM_EXECUTABLE_PATH "${EXECUTABLE_OUTPUT_PATH}")
+MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
 #-----------------------------------------------------------------------------
 # Build directory on which many applications depend
 SUBDIRS(
   src
   Dicts
-  Test
 )
+#-----------------------------------------------------------------------------
+# Example subdir:
+
+OPTION(BUILD_EXAMPLES "Build GDCM examples." ON)
+IF(BUILD_EXAMPLES)
+  SUBDIRS(Example)
+ENDIF(BUILD_EXAMPLES)
 
 #-----------------------------------------------------------------------------
 # Adding GDCM_DATA_ROOT
@@ -44,10 +49,10 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
   $ENV{PUB_DICT_PATH}/../../gdcmData
 )
 
-#-----------------------------------------------------------------------------
-# Set the place for the public dictionary
+# Set the place for the public dictionary, must be set before gdcmConfigure.h
 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)
@@ -57,10 +62,6 @@ 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)
 
@@ -68,12 +69,14 @@ INSTALL_FILES(/include .h gdcmConfigure.h)
 
 #-----------------------------------------------------------------------------
 # Add the testing directories
-OPTION(GDCM_BUILD_TESTING "Test the project" ON)
-IF(GDCM_BUILD_TESTING)
+OPTION(BUILD_TESTING "Build testing." ON)
+
+IF(BUILD_TESTING)
   ENABLE_TESTING()
   INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+  MARK_AS_ADVANCED(DART_ROOT)
   SUBDIRS(Test)
-ENDIF(GDCM_BUILD_TESTING)
+ENDIF(BUILD_TESTING)
 
 
 #-----------------------------------------------------------------------------