From c7fb64ba9ad7a8a3ce5a7a1b70b590d994bd130d Mon Sep 17 00:00:00 2001 From: Claire Mouton Date: Tue, 13 Dec 2011 16:18:51 +0000 Subject: [PATCH] bug ubuntu.. bbtkGEditor library conflict ... --- lib/GUI/Base/SurfaceRenderer/CMakeLists.txt | 2 +- lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt | 1 + lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt | 2 +- lib/maracasVisuLib/CMakeLists.txt | 7 +++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt b/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt index 090c30c..cf3a720 100644 --- 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 29f139c..9ba2589 100644 --- 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 22e636b..d6519d5 100644 --- 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 5fa08ea..14db134 100644 --- 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 + ) #---------------------------------------------------------------------------- -- 2.45.1