X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=7dd7db24b53977cf15b7c834c99ef5e7d4c58a93;hb=06b4871abe344407fcce79f440ecef87a2afe8f0;hp=525618d8e0e514ed54edb3a8c208c9b3f97e8267;hpb=962d2237c57a96d4a644da68b967abbbe1288840;p=creaMaracasVisu.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 525618d..7dd7db2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ PROJECT(creaMaracasVisu)
 
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 3)
+SET(PROJECT_BUILD_VERSION 4)
 
 #==================================
 
@@ -29,19 +29,22 @@ 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)
-SET(USE_QT4       ON)
 
-IF(USE_QT4)
-  SET(QT_USE_QTUITOOLS ON)
-ENDIF(USE_QT4)
+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)
 
@@ -68,33 +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
+#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 )
-#DCH
+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
+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
-                     ${PROJECT_SOURCE_DIR}/lib/Kernel/ITKVTK
                     )
 
 
 #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/)
+INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/gtk-2.0/include/)
+LINK_DIRECTORIES(/usr/lib/x86_64-linux-gnu/)
 #JCP Ubuntu this file not found glibconfig.h, config of wxgtk goes wrong somewhere
 
 ADD_SUBDIRECTORY(install)