no message

[creaMaracasVisu.git] / lib / maracasVisuLib / CMakeLists.txt

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 060e92d9d94862c5cba95b384bc38e66ad55ee8c..9ffe5868c6ce793c458624cdc0dacbd32cd65623 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -53,14 +53,16 @@ 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 )
 
@@ -88,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}
        
   )
   #----------------------------------------------------------------------------
@@ -110,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===========================================================================
@@ -132,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
+
     )
   #----------------------------------------------------------------------------
 
@@ -163,12 +181,13 @@ 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}
+  SET(${LIBRARY_NAME}_LIBRARIES 
+            ${LIBRARY_NAME}
+             BaseVolumeRenderer
+             BaseSurfaceRenderer
              KernelVolumeRenderer
              KernelViewerWidgets
              KernelSurfaceRenderer
-             BaseVolumeRenderer
-             BaseSurfaceRenderer
        )
 
 #  SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME}