X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=5824e07ede56d578cc67cd32110460995beb6a74;hb=0d8ca63a1a2c1a61c2e2b92526ba81c9885702ba;hp=38495bcf767a7ae0620c5aa4b91d4757d8010580;hpb=899b1fe44da54cbc2bde2be2a4dec5ec7606cf97;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38495bcf..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:
@@ -20,6 +20,7 @@ MARK_AS_ADVANCED(GDCM_DATA_DIR)
 OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
 
 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.")
@@ -31,8 +32,14 @@ MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 SUBDIRS(
   src
   Dicts
-  Example
 )
+#-----------------------------------------------------------------------------
+# Example subdir:
+
+OPTION(BUILD_EXAMPLES "Build GDCM examples." ON)
+IF(BUILD_EXAMPLES)
+  SUBDIRS(Example)
+ENDIF(BUILD_EXAMPLES)
 
 #-----------------------------------------------------------------------------
 # Adding GDCM_DATA_ROOT
@@ -62,9 +69,12 @@ INSTALL_FILES(/include .h gdcmConfigure.h)
 
 #-----------------------------------------------------------------------------
 # Add the testing directories
+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(BUILD_TESTING)