X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=3f2f6cfa66b7a6d6c6b7acebca83197afe3f1e7a;hb=31a84e3c7e162faa88942b8b47abf833cdcc5533;hp=06f8a721b189b170d7889dd33819ec6790abde41;hpb=5a27c495a6c3899102f76eb029b6aadcee4121c1;p=creaMaracasVisu.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06f8a72..3f2f6cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,15 +29,23 @@ FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
+
+
 CREA_PREVENT_IN_SOURCE_BUILD()
 
 #SET(USE_GDCM ON)
 #SET(USE_GDCM_VTK ON)
 SET(USE_WXWIDGETS ON)
 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()
@@ -63,16 +71,39 @@ 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 )
-INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/include )
-INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/controller/include )
-INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/include )
-#DCH
+#DFCH
+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 )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo )
+#DFCH
 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)