X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=2e2a1e564e756f5906f199b7eb0d9e10bc87f368;hb=279aed8cb3483318205a8b652e05457a7fc94dec;hp=141b9b50b658bb8ec03ca5f5bcb0d4cb439376f7;hpb=30e1456055bb7338c2f182c20642d735a0cf72fb;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 141b9b50..2e2a1e56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,23 +18,27 @@ 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)
 
 #-----------------------------------------------------------------------------
-#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}")
+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
 )
+#-----------------------------------------------------------------------------
+# Example subdir:
+
+OPTION(BUILD_EXAMPLES "Build GDCM examples." ON)
+IF(BUILD_EXAMPLES)
+  SUBDIRS(Example)
+ENDIF(BUILD_EXAMPLES)
 
 #-----------------------------------------------------------------------------
 # Adding GDCM_DATA_ROOT
@@ -44,10 +48,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 +61,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 +68,13 @@ 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)
   SUBDIRS(Test)
-ENDIF(GDCM_BUILD_TESTING)
+ENDIF(BUILD_TESTING)
 
 
 #-----------------------------------------------------------------------------