X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=3001c64db6e7a330fd82d053426416023ae58fb8;hb=187b1a04222ea6e8d11cc8270fdd64ba8409c7d9;hp=9581d2deab50af17bc1a535f794930dad7bee82e;hpb=9ddd28bedb530df448addc8851763ab796622b42;p=creaMaracasVisu.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9581d2d..3001c64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,14 +8,21 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
   CMAKE_POLICY(SET CMP0003 NEW)
   CMAKE_POLICY(SET CMP0005 NEW)
+  CMAKE_POLICY(SET CMP0011 NEW)
 ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
 
 PROJECT(creaMaracasVisu)
 
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 0)
+SET(PROJECT_BUILD_VERSION 3)
 
+#==================================
+
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
+#==================================
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -29,7 +36,7 @@ CREA_PREVENT_IN_SOURCE_BUILD()
 SET(USE_WXWIDGETS ON)
 SET(USE_VTK ON)
 SET(USE_ITK ON)
-SET(USE_BOOST OFF)
+SET(USE_BOOST ON)
 
 OPTION (${PROJECT_NAME}_DOC "${PROJECT_NAME}_DOC" OFF)
 
@@ -43,14 +50,28 @@ MARK_AS_ADVANCED(
   LIBRARY_OUTPUT_PATH
   )
 
-#SUBDIRS(appli)
-SUBDIRS(lib)
-SUBDIRS(bbtk)
-SUBDIRS(install)
+SET(CREAMARACASVISU_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
 
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/data/Icons )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/include )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/kernel )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/Contour )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/CutModule/interface )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/CutModule/kernel )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/../../../ )
 
 
+ADD_SUBDIRECTORY(install)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(bbtk)
+ADD_SUBDIRECTORY(appli)
 
 
 SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/data)
@@ -65,4 +86,4 @@ IF(WIN32)
 ELSE(WIN32)
 	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/data)
 	CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
-ENDIF(WIN32)
\ No newline at end of file
+ENDIF(WIN32)