X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=a44f67317d05d629a798ac549ae80511cb13488e;hb=6149d78df3e94ca789aaba50133d5277afe6ab5e;hp=7b93d2632a68d9beccef5e34054154ef04da9ff7;hpb=e7bfce0e23746e76746103c5df34eee1351e13cf;p=clitk.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b93d26..a44f673 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,11 +7,12 @@ if(COMMAND cmake_policy)
 endif(COMMAND cmake_policy)
 PROJECT(clitk)
 #=========================================================
-IF(CMAKE_COMPILER_IS_GNUCXX)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+#IF(CMAKE_COMPILER_IS_GNUCXX)
+#  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+#  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
+#ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 IF(MSVC)
-  ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
+  ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
 ENDIF(MSVC)
 #=========================================================
 # Find ITK (required)
@@ -23,6 +24,7 @@ ELSE(ITK_FOUND)
   MESSAGE(FATAL_ERROR
           "Cannot build without ITK.  Please set ITK_DIR.")
 ENDIF(ITK_FOUND)
+
 #=========================================================
 IF(CLITK_BUILD_VV)
     FIND_PACKAGE(VTK)
@@ -66,9 +68,11 @@ ENDIF(PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
 #=========================================================
 OPTION(CLITK_BUILD_VV "Build vv the 4D visualizer (requires VTK and QT)" ON)
 OPTION(CLITK_BUILD_TOOLS "Build command-line tools" OFF)
+OPTION(CLITK_EXPERIMENTAL "Enable experimental software and features" OFF)
+OPTION(CLITK_BUILD_SEGMENTATION "Build segmentation tools" OFF)
 #=========================================================
 
-include_directories(itk filters)
+include_directories(itk filters ${PROJECT_BINARY_DIR})
 
 #=========================================================
 add_subdirectory(common)
@@ -82,4 +86,8 @@ IF (CLITK_BUILD_TOOLS)
   add_subdirectory(tools)
 ENDIF(CLITK_BUILD_TOOLS)
 
+IF (CLITK_BUILD_SEGMENTATION)
+    add_subdirectory(segmentation)
+ENDIF (CLITK_BUILD_SEGMENTATION)
+
 #=========================================================