bug ubuntu.. bbtkGEditor library conflict ...

diff --git a/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt b/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt
index 090c30c5f7e0fafdc7a1352e2907ba93835c9df4..cf3a7200b29a7fc2cee22a5f25a1a60e5d0ecc77 100644 (file)
--- a/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt
+++ b/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt
@@ -52,7 +52,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #
   SET ( ${LIBRARY_NAME}_LINK_LIBRARIES
   #    ${crea_LIBRARIES}
-  #    ${WXWIDGETS_LIBRARIES}
+      ${WXWIDGETS_LIBRARIES}
   #    ${KWWidgets_LIBRARIES}
   #    ${VTK_LIBRARIES}
   #    ${ITK_LIBRARIES}

diff --git a/lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt b/lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt
index 29f139c0b1781e245d2194c4079160c1c33467df..9ba2589b64da330be9f8c10f6bc173a6b65c9c0f 100644 (file)
--- a/lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt
+++ b/lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt
@@ -45,6 +45,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #      )
   #----------------------------------------------------------------------------
 
+
   #----------------------------------------------------------------------------
   # LIBRARY DEPENDENCIES (LIBRARIES TO LINK WITH)
   #

diff --git a/lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt b/lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt
index 22e636bcdbf13715fcbf97030e69178e28d39fbc..d6519d5479f4e181267c9e4f83ff96b963766a1d 100644 (file)
--- a/lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt
+++ b/lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt
@@ -80,7 +80,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #
   SET ( ${LIBRARY_NAME}_LINK_LIBRARIES
   #    ${crea_LIBRARIES}
-  #    ${WXWIDGETS_LIBRARIES}
+      ${WXWIDGETS_LIBRARIES}
   #    ${KWWidgets_LIBRARIES}
       ${VTK_LIBRARIES}
       creaMaracasVisu

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 5fa08eaaa34ab3adfb2454b3f91217062ab0ad43..14db1349d5bd72f0e155d3ad953f0b7e125b899a 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -136,6 +136,13 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
        #${BOOST_LIBRARIES}
        #jhcl-End===========================================================================
                #creaMaracasVisu_CutModule_interface
+#EED CM
+            KernelVolumeRenderer
+             KernelViewerWidgets
+             KernelSurfaceRenderer
+             BaseVolumeRenderer
+             BaseSurfaceRenderer
+
     )
   #----------------------------------------------------------------------------