X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=0221e50eb3555dd02f2b3b2ea1dd104a40b6c48d;hb=16f9cff32207e43328678cdb17a0bccc3441b6cb;hp=3a74d435f9d6b72959154d2231c7545f1e2cef39;hpb=c18059db4f507fd31b5898667f57eced7d48c5f7;p=clitk.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a74d43..0221e50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ INCLUDE(cmake/common.cmake)
 # 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.")
@@ -27,7 +27,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)
@@ -57,33 +57,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_REGISTRATION "Build command-line registration tools" OFF)
-IF (CLITK_BUILD_REGISTRATION)
-  add_subdirectory(registration)
-ENDIF(CLITK_BUILD_REGISTRATION)
-
-#OPTION(CLITK_BUILD_SEGMENTATION "Build segmentation tools" OFF)
-#IF (CLITK_BUILD_SEGMENTATION)
-#  add_subdirectory(segmentation)
-#ENDIF (CLITK_BUILD_SEGMENTATION)
 #=========================================================