X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=6e77a53e21d35e04f7e3a538429d20e2dc5b2b06;hb=9cb8780edf257c286336c7355ecac466f07bbbc5;hp=133c8b72ce20fcefc93f9f4c29e5e220148824d0;hpb=7cdd257ac8ad23e435cfbcd768805ccd40acdad3;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index 133c8b7..6e77a53 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -26,25 +26,7 @@ IF ( BUILD_${LIBRARY_NAME} ) #---------------------------------------------------------------------------- # BUILD LIBRARY #---------------------------------------------------------------------------- -#jhcl-Start=========================================================================== - INCLUDE_DIRECTORIES( - include - src - #${MARACAS_SOURCE_DIR}/src/axe3DVTK - # ${MARACAS_SOURCE_DIR}/src/interface - src/kernel - #${MARACAS_SOURCE_DIR}/src/SnakeIsoContour+Deriche - src/interface/wxWindows - src/interface/wxWindows/Contour - src/interface/wxWindows/widgets - src/interface/wxWindows/widgets/pPlotter - src/interface/wxWindows/widgets/manualContour - src/interface/wxWindows/widgets/ThresholdImageView - src/CutModule/interface - src/CutModule/kernel - ../../../ -) #message(jhcl\n\n ${crea_LIBRARIES}) #INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake) #SET(CREA_LIBRARIES C:/creaBin/Debug/crea.lib) @@ -71,12 +53,30 @@ 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 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) + +FILE(GLOB ${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE include/*.h ) SET ( ${LIBRARY_NAME}_HEADERS ${${LIBRARY_NAME}_HEADERS_WXWIN} @@ -85,8 +85,14 @@ IF ( BUILD_${LIBRARY_NAME} ) ${${LIBRARY_NAME}_HEADERS_WIDGETS} ${${LIBRARY_NAME}_HEADERS_PPLOTTER} ${${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR} - include/matrix.h + ${${LIBRARY_NAME}_HEADERS_MANUAL_PAINT} + ${${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE} ${${LIBRARY_NAME}_HEADERS_KERNEL} + ${${LIBRARY_NAME}_HEADERS_CUTMODULE} + ${${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER} + ${${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER} + ${${LIBRARY_NAME}_HEADERS_UNDO_REDO} + ) #---------------------------------------------------------------------------- @@ -103,7 +109,12 @@ IF ( BUILD_${LIBRARY_NAME} ) ${${LIBRARY_NAME}_SOURCES_WIDGETS} ${${LIBRARY_NAME}_SOURCES_PPLOTTER} ${${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=========================================================================== @@ -125,7 +136,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 + ) #---------------------------------------------------------------------------- @@ -156,7 +181,26 @@ 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 + + BaseVolumeRenderer + BaseSurfaceRenderer + KernelVolumeRenderer + KernelViewerWidgets + KernelSurfaceRenderer + ${LIBRARY_NAME} + ) + +# SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME} +# BaseVolumeRenderer +# BaseSurfaceRenderer +# GUIWxSurfaceRenderer +# GUIWxVolumeRenderer +# KernelViewerWidgets +# KernelVolumeRenderer +# KernelSurfaceRenderer ) + # FILE(RELATIVE_PATH # ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS @@ -177,8 +221,20 @@ 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/../../../ ) + + IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".") ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) @@ -188,9 +244,8 @@ ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) IF(UNIX) - SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS - ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) - SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib) + SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) + SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CREAMARACASVISU_LIB_PATH} ) ELSE(UNIX) SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) @@ -220,7 +275,7 @@ IF(WIN32) ELSE(WIN32) INSTALL( TARGETS ${LIBRARY_NAME} - DESTINATION lib) + DESTINATION ${CREAMARACASVISU_LIB_PATH}) ENDIF(WIN32) #---------------------------------------------------------------------------- @@ -228,4 +283,4 @@ ENDIF(WIN32) #--------------------------------------------------------------------------- ENDIF ( BUILD_${LIBRARY_NAME} ) -SUBDIRS(src) +ADD_SUBDIRECTORY(src)