ENH: Now Example is an option, ON by default

[gdcm.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6889cca46931cf24c0cdc7bdbaf4ed0e2dd71a27..2e2a1e564e756f5906f199b7eb0d9e10bc87f368 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,23 +18,27 @@ MARK_AS_ADVANCED(GDCM_DATA_DIR)
 #-----------------------------------------------------------------------------\r
 # Build shared lib by default\r
 OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)\r
-SET(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})\r
 \r
+OPTION(GDCM_DEBUG "Turn verbosity of some statement ON." OFF)\r
 \r
 #-----------------------------------------------------------------------------\r
 SET (EXECUTABLE_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")\r
 SET (LIBRARY_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")\r
-#MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)\r
-#SET(GDCM_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}")\r
-#SET(GDCM_EXECUTABLE_PATH "${EXECUTABLE_OUTPUT_PATH}")\r
+MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)\r
 \r
 #-----------------------------------------------------------------------------\r
 # Build directory on which many applications depend\r
 SUBDIRS(\r
   src\r
   Dicts\r
-  Test\r
 )\r
+#-----------------------------------------------------------------------------\r
+# Example subdir:\r
+\r
+OPTION(BUILD_EXAMPLES "Build GDCM examples." ON)\r
+IF(BUILD_EXAMPLES)\r
+  SUBDIRS(Example)\r
+ENDIF(BUILD_EXAMPLES)\r
 \r
 #-----------------------------------------------------------------------------\r
 # Adding GDCM_DATA_ROOT\r
@@ -44,10 +48,10 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
   $ENV{PUB_DICT_PATH}/../../gdcmData\r
 )\r
 \r
-#-----------------------------------------------------------------------------\r
-# Set the place for the public dictionary\r
+# Set the place for the public dictionary, must be set before gdcmConfigure.h\r
 SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")\r
 \r
+#-----------------------------------------------------------------------------\r
 # SunOS + old gcc fixes:\r
 INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)\r
 IF(CMAKE_NO_ANSI_STRING_STREAM)\r
@@ -57,10 +61,6 @@ ENDIF(CMAKE_NO_ANSI_STRING_STREAM)
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)\r
 CHECK_INCLUDE_FILE("stdint.h" CMAKE_HAVE_STDINT_H)\r
 \r
-IF(NOT CMAKE_HAVE_STDINT_H)\r
-  SET(GDCM_HAVE_NO_STDINT_H 1)\r
-ENDIF(NOT CMAKE_HAVE_STDINT_H)\r
-\r
 CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in\r
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)\r
 \r
@@ -68,12 +68,13 @@ INSTALL_FILES(/include .h gdcmConfigure.h)
 \r
 #-----------------------------------------------------------------------------\r
 # Add the testing directories\r
-OPTION(GDCM_BUILD_TESTING "Test the project" ON)\r
-IF(GDCM_BUILD_TESTING)\r
+OPTION(BUILD_TESTING "Build testing." ON)\r
+\r
+IF(BUILD_TESTING)\r
   ENABLE_TESTING()\r
   INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)\r
   SUBDIRS(Test)\r
-ENDIF(GDCM_BUILD_TESTING)\r
+ENDIF(BUILD_TESTING)\r
 \r
 \r
 #-----------------------------------------------------------------------------\r