Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c007a11c870295618cbd5497d25253bf1a5fa006..de9c55b0006aa0f489a39da99e1a281bdf0cfc3f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,13 +44,22 @@ ENDIF (CLITK_GENGETOPT STREQUAL "CLITK_GENGETOPT-NOTFOUND")
 # Find libstatgrab is installed, add clitkMemoryUsage.cxx in the library
 FIND_LIBRARY(LIBSTATGRAB NAMES statgrab PATHS)
 IF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
-  MESSAGE("Install libstatgrab (http://www.i-scream.org/libstatgrab/) for memory usage information")
+#  MESSAGE("Install libstatgrab (http://www.i-scream.org/libstatgrab/) for memory usage information")
   SET(CLITK_MEMORY_INFO OFF)
 ELSE (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
   SET(CLITK_MEMORY_INFO ON)
 ENDIF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")  
 #=========================================================
 
+#=========================================================
+# If the user choose to build documentation, then search for Doxygen executables.
+OPTION(BUILD_DOXYGEN "Build Doxygen Documentation" OFF)
+IF(BUILD_DOXYGEN)
+  FIND_PACKAGE(Doxygen)
+  ADD_SUBDIRECTORY(Doxygen)
+ENDIF(BUILD_DOXYGEN)
+#=========================================================
+
 #=========================================================
 # Building in the source tree is forbidden
 IF(PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
@@ -84,7 +93,7 @@ OPTION(CLITK_BUILD_REGISTRATION "Build command-line registration tools" OFF)
 
 OPTION(CLITK_BUILD_VV "Build vv the 4D visualizer (requires VTK and QT)" ON)
 IF (CLITK_BUILD_VV)
-  add_subdirectory(vv)
+  ADD_SUBDIRECTORY(vv)
 ENDIF(CLITK_BUILD_VV)
 
 
@@ -92,8 +101,9 @@ ENDIF(CLITK_BUILD_VV)
 #Support for the CTest dashboard testing system
 INCLUDE(CTest)
 #=========================================================
-add_subdirectory(tests)
-add_subdirectory(tests/tools)
+IF (BUILD_TESTING)
+  ADD_SUBDIRECTORY(tests)
+ENDIF(BUILD_TESTING)
 #=========================================================