X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=9ed5f293da4382736d25615574d1989c0d10f6cf;hb=b20bfc9c30fef820a0e92e03a1ba58c0949b602e;hp=7a8b9d0c5204a58f1319dfd8af2853ad9caa9ebe;hpb=f38984f56e3dbccb5d3a8392aa3e5cbb698bf2d8;p=creaMaracasVisu.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a8b9d0..9ed5f29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,12 @@ SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_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)
@@ -44,30 +50,35 @@ MARK_AS_ADVANCED(
   LIBRARY_OUTPUT_PATH
   )
 
-IF (WIN32)
-  SET(CREAMARACASVISU_LIB_PATH bin)
-ELSE (WIN32)
-	if( NOT APPLE )
-		# check 64 bit
-		if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-			set( HAVE_64_BIT 0 )
-			SET(CREAMARACASVISU_LIB_PATH lib)
-		else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
-			set( HAVE_64_BIT 1 )
-			SET(CREAMARACASVISU_LIB_PATH lib64)
-		endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-	 endif( NOT APPLE )
-ENDIF(WIN32)
-
-
-
-
-SUBDIRS(install)
-#SUBDIRS(appli)
-SUBDIRS(lib)
-SUBDIRS(bbtk)
+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 )
+#DCH
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/controller )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer )
+#DCH
+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)
 FILE(GLOB CONFIGURE_DATA_FILES *.*)