X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=8cac05722c236e1127c567cfcedbcc1ee134b960;hb=afeeee6e8ef4a7b29e33db89bf6fc03542201ed1;hp=3aabe42294d9449403744b2d5100f5dc186cf14f;hpb=da49daa116f90f69389add7c0afca89a99adbb21;p=creaMaracasVisu.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aabe42..8cac057 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)
@@ -32,6 +38,13 @@ SET(USE_VTK ON)
 SET(USE_ITK ON)
 SET(USE_BOOST ON)
 
+OPTION(QT_USE_QTUITOOLS "QT_USE_QTUITOOLS" OFF)
+IF(QT_USE_QTUITOOLS)
+	SET(USE_QT4 ON)
+ELSE(QT_USE_QTUITOOLS)
+	SET(USE_QT4 OFF)
+ENDIF(QT_USE_QTUITOOLS)
+
 OPTION (${PROJECT_NAME}_DOC "${PROJECT_NAME}_DOC" OFF)
 
 CREA_FIND_AND_USE_LIBRARIES()
@@ -57,10 +70,38 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWi
 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/../../../ )
 
+INCLUDE_DIRECTORIES(
+                     ${PROJECT_BINARY_DIR}/lib/GUI/Qt/Viewers
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Qt/Viewers
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Qt/VolumeRenderer
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Qt/SurfaceRenderer
+
+
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Wx/VolumeRenderer
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Wx/SurfaceRenderer
+
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Base/VolumeRenderer
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Base/SurfaceRenderer
+
+                     ${PROJECT_SOURCE_DIR}/lib/Kernel/VTKObjects/SurfaceRenderer
+                     ${PROJECT_SOURCE_DIR}/lib/Kernel/VTKObjects/ViewerWidgets
+                     ${PROJECT_SOURCE_DIR}/lib/Kernel/VTKObjects/VolumeRenderer
+                    )
+
+
+#JCP Ubuntu this file not found glibconfig.h, config of wxgtk goes wrong somewhere
+INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/glib-2.0/include/)
+#JCP Ubuntu this file not found glibconfig.h, config of wxgtk goes wrong somewhere
 
 ADD_SUBDIRECTORY(install)
 ADD_SUBDIRECTORY(lib)