X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=9ffe5868c6ce793c458624cdc0dacbd32cd65623;hb=11899b8f7418abb4b95b70cd574d2de1c7f353ca;hp=eac5db6d6217405a96b874bcef38506f4dcca2bb;hpb=d1b3c9b4ae358999bd36d6205ae96aac87de546e;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index eac5db6..9ffe586 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -53,19 +53,22 @@ IF ( BUILD_${LIBRARY_NAME} )
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_PPLOTTER "src/interface/wxWindows/widgets/pPlotter/*.h")
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_PPLOTTER src/interface/wxWindows/widgets/pPlotter/*.cxx src/interface/wxWindows/widgets/pPlotter/*.cpp src/interface/wxWindows/widgets/pPlotter/*.cc)
 
-#DCH
+#DFCH
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER "src/interface/wxWindows/widgets/creaButtonContainer/model/*.h" "src/interface/wxWindows/widgets/creaButtonContainer/model/*.txx" "src/interface/wxWindows/widgets/creaButtonContainer/view/*.h" "src/interface/wxWindows/widgets/creaButtonContainer/controller/*.h" )
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_CBUTTONCONTAINER src/interface/wxWindows/widgets/creaButtonContainer/model/*.cxx src/interface/wxWindows/widgets/creaButtonContainer/view/*.cxx src/interface/wxWindows/widgets/creaButtonContainer/controller/*.cxx )
 
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER "src/interface/wxWindows/widgets/creaPanelButtonContainer/*.h" )
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_CPBUTTONCONTAINER src/interface/wxWindows/widgets/creaPanelButtonContainer/*.cxx )  
-#DCH
 
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_UNDO_REDO "src/interface/wxWindows/widgets/imageUndoRedo/*.h")
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_UNDO_REDO  src/interface/wxWindows/widgets/imageUndoRedo/*.cxx )
+#DFCH
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR "src/interface/wxWindows/widgets/manualContour/*.h")
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR src/interface/wxWindows/widgets/manualContour/*.cpp )
 
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_MANUAL_PAINT "src/interface/wxWindows/widgets/manualPaint/*.h")
-  FILE(GLOB ${LIBRARY_NAME}_SOURCES_MANUAL_PAINT src/interface/wxWindows/widgets/manualPaint/*.cpp )
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_MANUAL_PAINT src/interface/wxWindows/widgets/manualPaint/*.cpp src/interface/wxWindows/widgets/manualPaint/*.cxx )
+  # FILE(GLOB ${LIBRARY_NAME}_SOURCES_MANUAL_PAINT src/interface/wxWindows/widgets/manualPaint/*.cxx ) #DFCH
 
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_KERNEL "src/kernel/*.h")
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_KERNEL src/kernel/*.cxx src/kernel/*.cpp src/kernel/*.cc)
@@ -87,6 +90,7 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
 	${${LIBRARY_NAME}_HEADERS_CUTMODULE}
 	${${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER}
 	${${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER}
+	${${LIBRARY_NAME}_HEADERS_UNDO_REDO}
 	
   )
   #----------------------------------------------------------------------------
@@ -109,6 +113,7 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
 	${${LIBRARY_NAME}_SOURCES_CUTMODULE}
 	${${LIBRARY_NAME}_SOURCES_CBUTTONCONTAINER}
 	${${LIBRARY_NAME}_SOURCES_CPBUTTONCONTAINER}
+	${${LIBRARY_NAME}_SOURCES_UNDO_REDO}
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================
@@ -131,6 +136,20 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
 	#${BOOST_LIBRARIES}
 	#jhcl-End===========================================================================
 		#creaMaracasVisu_CutModule_interface
+
+
+             BaseVolumeRenderer
+             BaseSurfaceRenderer
+             KernelVolumeRenderer
+             KernelViewerWidgets
+             KernelSurfaceRenderer
+
+#EED CM
+   	     #KernelVolumeRenderer
+#EED             KernelViewerWidgets
+             #KernelSurfaceRenderer
+             #BaseSurfaceRenderer
+
     )
   #----------------------------------------------------------------------------
 
@@ -161,14 +180,25 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
 
  # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
   SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME})
-  SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME}  
-				BaseVolumeRenderer
-				BaseSurfaceRenderer
-  				GUIWxSurfaceRenderer
-  				GUIWxVolumeRenderer
-  				KernelViewerWidgets
-	 	 		KernelVolumeRenderer
-  				KernelSurfaceRenderer	)
+
+  SET(${LIBRARY_NAME}_LIBRARIES 
+	     ${LIBRARY_NAME}
+             BaseVolumeRenderer
+             BaseSurfaceRenderer
+             KernelVolumeRenderer
+             KernelViewerWidgets
+             KernelSurfaceRenderer
+       )
+
+#  SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME}
+#				BaseVolumeRenderer
+#				BaseSurfaceRenderer
+#  				GUIWxSurfaceRenderer
+#  				GUIWxVolumeRenderer
+#  				KernelViewerWidgets
+#	 	 		KernelVolumeRenderer
+#  				KernelSurfaceRenderer	)
+
 
 #  FILE(RELATIVE_PATH
  #   ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
@@ -189,6 +219,16 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
     lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter
 	lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour
 	lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView
+	lib/GUI/Base/SurfaceRenderer
+	lib/GUI/Base/VolumeRenderer
+	lib/GUI/Qt/SurfaceRenderer
+	lib/GUI/Qt/Viewers
+	lib/GUI/Qt/VolumeRenderer
+	lib/GUI/Wx/SurfaceRenderer
+	lib/GUI/Wx/VolumeRenderer
+	lib/Kernel/VTKObjects/SurfaceRenderer
+	lib/Kernel/VTKObjects/ViewerWidgets
+	lib/Kernel/VTKObjects/VolumeRenderer
 	lib/maracasVisuLib/../../../
 )