X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=d4896a4fce372c711f44b5d0a99de1ca535b2b8d;hb=22f291ff6afce66933c2a8fe97097692680d186b;hp=4929a371bad173f7d95847725bbabfdefc965c6c;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index 4929a37..d4896a4 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -63,6 +63,7 @@ IF ( BUILD_${LIBRARY_NAME} ) #FILE(GLOB ${LIBRARY_NAME}_HEADERS "*.h") # OR MANUALLY LIST YOUR HEADERS WITH NEXT COMMAND + FILE(GLOB ${LIBRARY_NAME}_HEADERS_WXWIN "src/interface/wxWindows/*.h") FILE(GLOB ${LIBRARY_NAME}_SOURCES_WXWIN src/interface/wxWindows/*.cxx src/interface/wxWindows/*.cpp src/interface/wxWindows/*.cc) @@ -98,10 +99,10 @@ IF ( BUILD_${LIBRARY_NAME} ) 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}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutModule/kernel/*.h) FILE(GLOB ${LIBRARY_NAME}_SOURCES_CUTMODULE src/CutModule/interface/*.cxx src/CutModule/kernel/*.cxx) -FILE(GLOB ${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE include/*.h ) + FILE(GLOB ${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE include/*.h ) SET ( ${LIBRARY_NAME}_HEADERS ${${LIBRARY_NAME}_HEADERS_WXWIN} @@ -117,7 +118,6 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE include/*.h ) ${${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER} ${${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER} ${${LIBRARY_NAME}_HEADERS_UNDO_REDO} - ) #---------------------------------------------------------------------------- @@ -164,11 +164,13 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE include/*.h ) #creaMaracasVisu_CutModule_interface - BaseVolumeRenderer - BaseSurfaceRenderer - KernelVolumeRenderer - KernelViewerWidgets - KernelSurfaceRenderer + BaseVolumeRenderer + BaseSurfaceRenderer + KernelVolumeRenderer + KernelViewerWidgets + KernelSurfaceRenderer + GUIWxSurfaceRenderer + GUIWxVolumeRenderer #EED CM #KernelVolumeRenderer @@ -199,6 +201,9 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE include/*.h ) # CREATE THE TARGET +set (${LIBRARY_NAME}_SHARED SHARED) +message(EED mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm "${${LIBRARY_NAME}_SHARED}" ) +message(EED mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm ${LIBRARY_NAME} ) ADD_LIBRARY (${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS}) # LINK @@ -208,7 +213,6 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE include/*.h ) SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME}) SET(${LIBRARY_NAME}_LIBRARIES - BaseVolumeRenderer BaseSurfaceRenderer KernelVolumeRenderer