X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=80e2f18d960a7cb20179f128a8a0a959b7f70c9d;hb=4b092ee0b1bcda4d298e5ffc3b58b599e273db20;hp=f6de5871e6e0a3c132ae6bb07247bc1fff322dd1;hpb=da49daa116f90f69389add7c0afca89a99adbb21;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index f6de587..80e2f18 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -53,6 +53,14 @@ 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 + FILE(GLOB ${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER "src/interface/wxWindows/widgets/creaButtonContainer/model/*.h" "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_MANUAL_CONTOUR "src/interface/wxWindows/widgets/manualContour/*.h") FILE(GLOB ${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR src/interface/wxWindows/widgets/manualContour/*.cpp ) @@ -62,6 +70,9 @@ 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}_SOURCES_CUTMODULE src/CutModule/interface/*.cxx src/CutModule/kernel/*.cxx) + SET ( ${LIBRARY_NAME}_HEADERS ${${LIBRARY_NAME}_HEADERS_WXWIN} @@ -73,6 +84,10 @@ IF ( BUILD_${LIBRARY_NAME} ) ${${LIBRARY_NAME}_HEADERS_MANUAL_PAINT} include/matrix.h ${${LIBRARY_NAME}_HEADERS_KERNEL} + ${${LIBRARY_NAME}_HEADERS_CUTMODULE} + ${${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER} + ${${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER} + ) #---------------------------------------------------------------------------- @@ -91,6 +106,9 @@ IF ( BUILD_${LIBRARY_NAME} ) ${${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} ) #---------------------------------------------------------------------------- #jhcl-Start=========================================================================== @@ -112,7 +130,7 @@ IF ( BUILD_${LIBRARY_NAME} ) ${CREA_LIBRARIES} #${BOOST_LIBRARIES} #jhcl-End=========================================================================== - creaMaracasVisu_CutModule_interface + #creaMaracasVisu_CutModule_interface ) #----------------------------------------------------------------------------