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

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index f6de587..9ffe586 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -53,15 +53,29 @@ 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)
 
+#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 )  
+
+  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)
 
+FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutModule/kernel/*.h)
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CUTMODULE src/CutModule/interface/*.cxx src/CutModule/kernel/*.cxx)
+
 
   SET ( ${LIBRARY_NAME}_HEADERS
   	${${LIBRARY_NAME}_HEADERS_WXWIN}
@@ -73,6 +87,11 @@ IF ( BUILD_${LIBRARY_NAME} )
     	${${LIBRARY_NAME}_HEADERS_MANUAL_PAINT}
     	include/matrix.h
 	${${LIBRARY_NAME}_HEADERS_KERNEL}
+	${${LIBRARY_NAME}_HEADERS_CUTMODULE}
+	${${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER}
+	${${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER}
+	${${LIBRARY_NAME}_HEADERS_UNDO_REDO}
+	
   )
   #----------------------------------------------------------------------------
 
@@ -91,6 +110,10 @@ IF ( BUILD_${LIBRARY_NAME} )
 	${${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR}
 	${${LIBRARY_NAME}_SOURCES_MANUAL_PAINT}
 	${${LIBRARY_NAME}_SOURCES_KERNEL}
+	${${LIBRARY_NAME}_SOURCES_CUTMODULE}
+	${${LIBRARY_NAME}_SOURCES_CBUTTONCONTAINER}
+	${${LIBRARY_NAME}_SOURCES_CPBUTTONCONTAINER}
+	${${LIBRARY_NAME}_SOURCES_UNDO_REDO}
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================
@@ -112,7 +135,21 @@ IF ( BUILD_${LIBRARY_NAME} )
 		${CREA_LIBRARIES}
 	#${BOOST_LIBRARIES}
 	#jhcl-End===========================================================================
-		creaMaracasVisu_CutModule_interface
+		#creaMaracasVisu_CutModule_interface
+
+
+             BaseVolumeRenderer
+             BaseSurfaceRenderer
+             KernelVolumeRenderer
+             KernelViewerWidgets
+             KernelSurfaceRenderer
+
+#EED CM
+   	     #KernelVolumeRenderer
+#EED             KernelViewerWidgets
+             #KernelSurfaceRenderer
+             #BaseSurfaceRenderer
+
     )
   #----------------------------------------------------------------------------
 
@@ -143,7 +180,25 @@ IF ( BUILD_${LIBRARY_NAME} )
 
  # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
   SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME})
-  SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME})
+
+  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
@@ -164,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/../../../
 )