* Test/TestAllEntryVerify.cxx minor fix and added comments.

[gdcm.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67f483b2dedeb0e5e74d947cbd87050882ceb5b0..5824e07ede56d578cc67cd32110460995beb6a74 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.8)
 \r
 #-----------------------------------------------------------------------------\r
 # GDCM version number, usefull for packaging and doxygen doc:\r
-SET(GDCM_VERSION_MAJOR 0)\r
-SET(GDCM_VERSION_MINOR 4)\r
-SET(GDCM_VERSION_PATCH 1)\r
-SET(GDCM_VERSION "${GDCM_VERSION_MAJOR}.${GDCM_VERSION_MINOR}")\r
-SET(GDCM_VERSION_FULL "${GDCM_VERSION}.${GDCM_VERSION_PATCH}")\r
+SET(GDCM_MAJOR_VERSION 0)\r
+SET(GDCM_MINOR_VERSION 4)\r
+SET(GDCM_BUILD_VERSION 1)\r
+SET(GDCM_VERSION \r
+    "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")\r
 \r
 #-----------------------------------------------------------------------------\r
 # datadir in CMake:\r
@@ -20,6 +20,7 @@ MARK_AS_ADVANCED(GDCM_DATA_DIR)
 OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)\r
 \r
 OPTION(GDCM_DEBUG "Turn verbosity of some statement ON." OFF)\r
+MARK_AS_ADVANCED(GDCM_DEBUG)\r
 \r
 #-----------------------------------------------------------------------------\r
 SET (EXECUTABLE_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")\r
@@ -31,8 +32,14 @@ MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 SUBDIRS(\r
   src\r
   Dicts\r
-  Example\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
@@ -67,6 +74,7 @@ OPTION(BUILD_TESTING "Build testing." ON)
 IF(BUILD_TESTING)\r
   ENABLE_TESTING()\r
   INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)\r
+  MARK_AS_ADVANCED(DART_ROOT)\r
   SUBDIRS(Test)\r
 ENDIF(BUILD_TESTING)\r
 \r