X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=563db003a99f5d6111703fda6b9fe480b7b18b20;hb=9553e9c6ccc78a65b4dfb5d9b661ff4da05ce2c4;hp=dd3eb245fca98cae054a1c284b6f185bad2dcac9;hpb=8abe9edbdc63a33f8fbb1f321073b762e08be9aa;p=clitk.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd3eb24..563db00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,15 +11,17 @@ PROJECT(clitk)
 #=========================================================
 INCLUDE(cmake/common.cmake)
 #=========================================================
+#Support for the CTest dashboard testing system
+INCLUDE(CTest)
+#=========================================================
 
 #=========================================================
 # Find ITK (required)
 FIND_PACKAGE(ITK)
 IF(ITK_FOUND)
-  INCLUDE(${ITK_USE_FILE})
+  INCLUDE("${ITK_USE_FILE}")
 ELSE(ITK_FOUND)
-  MESSAGE(FATAL_ERROR
-          "Cannot build without ITK.  Please set ITK_DIR.")
+  MESSAGE(FATAL_ERROR "Cannot build without ITK.  Please set ITK_DIR.")
 ENDIF(ITK_FOUND)
 #=========================================================
 
@@ -27,7 +29,7 @@ ENDIF(ITK_FOUND)
 # Find VTK (required)
 FIND_PACKAGE(VTK REQUIRED)
 IF(VTK_FOUND)
-  INCLUDE(${VTK_USE_FILE})
+  INCLUDE("${VTK_USE_FILE}")
 ELSE(VTK_FOUND)
   MESSAGE(FATAL_ERROR "Please set VTK_DIR.")
 ENDIF(VTK_FOUND)
@@ -41,6 +43,14 @@ IF (CLITK_GENGETOPT STREQUAL "CLITK_GENGETOPT-NOTFOUND")
 ENDIF (CLITK_GENGETOPT STREQUAL "CLITK_GENGETOPT-NOTFOUND")
 #=========================================================
 
+#=========================================================
+# Find libstatgrab is installed, add clitkMemoryUsage.cxx in the library
+FIND_PROGRAM(LIBSTATGRAB NAMES statgrab PATHS)
+IF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+  MESSAGE("Install libstatgrab (http://www.i-scream.org/libstatgrab/) for memory usage information")
+ENDIF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")  
+#=========================================================
+
 #=========================================================
 # Building in the source tree is forbidden
 IF(PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
@@ -57,34 +67,24 @@ ENDIF(MSVC)
 #=========================================================
 
 #=========================================================
-INCLUDE_DIRECTORIES(itk filters ${PROJECT_BINARY_DIR})
+INCLUDE_DIRECTORIES(itk filters segmentation registration tools ${PROJECT_BINARY_DIR})
 
 # Select what is compiled
 ADD_SUBDIRECTORY(common)
-ADD_SUBDIRECTORY(filters)
+add_subdirectory(tools)
+add_subdirectory(segmentation)
+add_subdirectory(registration)
 
 # Compilation options
 OPTION(CLITK_EXPERIMENTAL "Enable experimental software and features" OFF)
+OPTION(CLITK_BUILD_TOOLS "Build command-line tools" OFF)
+OPTION(CLITK_BUILD_SEGMENTATION "Build command-line segmentation tools" OFF)
+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)
 ENDIF(CLITK_BUILD_VV)
 
-OPTION(CLITK_BUILD_TOOLS "Build command-line tools" OFF)
-IF (CLITK_BUILD_TOOLS)
-  add_subdirectory(tools)
-ENDIF(CLITK_BUILD_TOOLS)
-
-OPTION(CLITK_BUILD_SEGMENTATION "Build segmentation tools" ON)
-IF (CLITK_BUILD_SEGMENTATION)
-  add_subdirectory(segmentation)
-ENDIF (CLITK_BUILD_SEGMENTATION)
-
-OPTION(CLITK_BUILD_REGISTRATION "Build command-line registration tools" OFF)
-IF (CLITK_BUILD_REGISTRATION)
-  add_subdirectory(registration)
-ENDIF(CLITK_BUILD_REGISTRATION)
-
 #=========================================================