X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=5b110e42453802969a7018776a892a4e25204d30;hb=ba590c90164ed4849030febe99143476a4a4abe6;hp=8a6fa2fa15461ddcb81963db131fd8b54205bd66;hpb=3293ac42f2b0b200e78808f1d5b6e625d9e7486f;p=crea.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a6fa2f..5b110e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,21 +1,41 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 PROJECT(crea)
 
 INCLUDE(Version.cmake)
 SET(CREA_VERBOSE_CMAKE TRUE)
 SET(CREA_CMAKE_REL_PATH cmake)
 SET(CREA_CMAKE_DIR ${PROJECT_SOURCE_DIR}/${CREA_CMAKE_REL_PATH})
+INCLUDE(${CREA_CMAKE_DIR}/CREACMakeSettings.cmake NO_POLICY_SCOPE)
 INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 
 CREA_PREVENT_IN_SOURCE_BUILD()
 
-SET(USE_VTK ON)
-#SET(USE_BOOST ON)
-SET(USE_WXWIDGETS ON)
+SET(USE_BOOST ON)
+
+OPTION(CREA_BUILD_VTK "Build crea with vtk ?" OFF)
+IF(CREA_BUILD_VTK)
+  SET(USE_VTK ON)
+  SET(CREA_BUILT_WITH_VTK ON)
+ENDIF(CREA_BUILD_VTK)
+
+OPTION(CREA_BUILD_WX "Build crea with wxWidgets ?" OFF)
+IF(CREA_BUILD_WX)
+  SET(USE_WXWIDGETS ON)
+  SET(CREA_BUILT_WITH_WX ON)
+ENDIF(CREA_BUILD_WX)
 
 CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+IF (WIN32)
+  SET(CREA_LIB_PATH bin)
+ELSE (WIN32)
+  SET(CREA_LIB_PATH lib)
+ENDIF(WIN32)
+
+
+
 MARK_AS_ADVANCED(
   CMAKE_BACKWARDS_COMPATIBILITY
   EXECUTABLE_OUTPUT_PATH