X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=b03fb04f4bf605c3b85c1edce78ba15c2ca1b473;hb=212f0d0bcfc27b9e79be4c1536e49dcb7f55041d;hp=9b12f8ff7e8758b3ebb40ce2d4fe503af4dfcba1;hpb=414da1a291ff4c9d9a946536d3d219e4b5f9e6c2;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index 9b12f8f..b03fb04 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -35,6 +35,7 @@ IF ( BUILD_${LIBRARY_NAME} ) src/interface/wxWindows/widgets src/interface/wxWindows/widgets/pPlotter src/interface/wxWindows/widgets/manualContour + src/interface/wxWindows/widgets/ThresholdImageView ../../../ ) #message(jhcl\n\n ${crea_LIBRARIES}) @@ -53,6 +54,9 @@ IF ( BUILD_${LIBRARY_NAME} ) FILE(GLOB ${LIBRARY_NAME}_HEADERS_CONTOUR "src/interface/wxWindows/Contour/*.h") FILE(GLOB ${LIBRARY_NAME}_SOURCES_CONTOUR src/interface/wxWindows/Contour/*.cxx src/interface/wxWindows/Contour/*.cpp src/interface/wxWindows/Contour/*.cc) + + FILE(GLOB ${LIBRARY_NAME}_HEADERS_ThresholdImageView "src/interface/wxWindows/widgets/ThresholdImageView/*.h") + FILE(GLOB ${LIBRARY_NAME}_SOURCES_ThresholdImageView src/interface/wxWindows/widgets/ThresholdImageView/*.cxx src/interface/wxWindows/widgets/ThresholdImageView/*.cpp src/interface/wxWindows/widgets/ThresholdImageView/*.cc) FILE(GLOB ${LIBRARY_NAME}_HEADERS_WIDGETS "src/interface/wxWindows/widgets/*.h") FILE(GLOB ${LIBRARY_NAME}_SOURCES_WIDGETS src/interface/wxWindows/widgets/*.cxx src/interface/wxWindows/widgets/*.cpp src/interface/wxWindows/widgets/*.cc) @@ -68,73 +72,13 @@ IF ( BUILD_${LIBRARY_NAME} ) SET ( ${LIBRARY_NAME}_HEADERS - #src/interface/wxWindows/manualContour.h - #src/interface/wxWindows/wxMaracasMPR.h - #src/interface/wxWindows/wxMaracas_ManualTree_MPR.h ${${LIBRARY_NAME}_HEADERS_WXWIN} - #src/interface/wxWindows/Contour/AutoControlPoints.h - #src/interface/wxWindows/Contour/ContourCrownWidget.h - #src/interface/wxWindows/Contour/ContourExtractData.h - #src/interface/wxWindows/Contour/ContourPropagation.h - #src/interface/wxWindows/Contour/contoursIntersection.h - #src/interface/wxWindows/Contour/ContourVOIWidget.h - #src/interface/wxWindows/Contour/ExtractControlPoints2D.h - #src/interface/wxWindows/Contour/Propagation.h - #src/interface/wxWindows/Contour/vectorFunctions.h - ${${LIBRARY_NAME}_HEADERS_CONTOUR} -## src/interface/wxWindows/wxMaracasImageBrowser02.h -## src/interface/wxWindows/widgets/wxReadingPriorityPanel.h - #src/interface/wxWindows/widgets/ContourView.h - #src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h - #src/interface/wxWindows/widgets/LineView.h - #src/interface/wxWindows/widgets/PointView.h - #src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.h - #src/interface/wxWindows/widgets/vtkClosePolyData.h - #src/interface/wxWindows/widgets/wxMaracasIRMView.h - #src/interface/wxWindows/widgets/wxMaracasIRMViewManager.h - #src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h - #src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h - #src/interface/wxWindows/widgets/wxManualTree_MPRWidget.h - #src/interface/wxWindows/widgets/wxMPRBaseData.h - #src/interface/wxWindows/widgets/wxMPRWidget.h - #src/interface/wxWindows/widgets/wxSTLWidget_03.h - #src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h - #src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h - #src/interface/wxWindows/widgets/wxVtkBaseView.h - ${${LIBRARY_NAME}_HEADERS_WIDGETS} - #src/interface/wxWindows/widgets/pPlotter/Histogram.h - #src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h - #src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h - #src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.h - #src/interface/wxWindows/widgets/pPlotter/mBarRange.h - #src/interface/wxWindows/widgets/pPlotter/mathplot.h - #src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.h - #src/interface/wxWindows/widgets/pPlotter/pColorBar.h - #src/interface/wxWindows/widgets/pPlotter/pColorPoint.h - #src/interface/wxWindows/widgets/pPlotter/pFigure.h - #src/interface/wxWindows/widgets/pPlotter/pFunctionPoint.h - #src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h - #src/interface/wxWindows/widgets/pPlotter/pHistogram.h - #src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h - #src/interface/wxWindows/widgets/pPlotter/pPlotter.h - #src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h - #src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h - #src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.h - #src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h - ${${LIBRARY_NAME}_HEADERS_PPLOTTER} - ${${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR} - - include/matrix.h - - #src/kernel/marImageData.h - #src/kernel/marDicomBase.h - #src/kernel/marObject.h - #src/kernel/volume.hxx - #src/kernel/marTypes.h - #src/kernel/marParameters.h - #src/kernel/marDynData.h - #src/kernel/creaMaracasVisu_EXPORT.h - #src/kernel/vtkSTLExtractor.h + ${${LIBRARY_NAME}_HEADERS_CONTOUR} + ${${LIBRARY_NAME}_HEADERS_ThresholdImageView} + ${${LIBRARY_NAME}_HEADERS_WIDGETS} + ${${LIBRARY_NAME}_HEADERS_PPLOTTER} + ${${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR} + include/matrix.h ${${LIBRARY_NAME}_HEADERS_KERNEL} ) #---------------------------------------------------------------------------- @@ -146,71 +90,12 @@ IF ( BUILD_${LIBRARY_NAME} ) # OR MANUALLY LIST YOUR FILES WITH NEXT COMMAND (WITHOUT EXTENSION) SET ( ${LIBRARY_NAME}_SOURCES - #src/interface/wxWindows/manualContour.cpp - #src/interface/wxWindows/wxMaracasMPR.cxx - #src/interface/wxWindows/wxMaracas_ManualTree_MPR.cxx ${${LIBRARY_NAME}_SOURCES_WXWIN} - #src/interface/wxWindows/Contour/AutoControlPoints.cxx - #src/interface/wxWindows/Contour/ContourCrownWidget.cxx - #src/interface/wxWindows/Contour/ContourExtractData.cxx - #src/interface/wxWindows/Contour/ContourPropagation.cxx - #src/interface/wxWindows/Contour/contoursIntersection.cxx - #src/interface/wxWindows/Contour/ContourVOIWidget.cxx - #src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx - #src/interface/wxWindows/Contour/Propagation.cxx - #src/interface/wxWindows/Contour/vectorFunctions.cxx - ${${LIBRARY_NAME}_SOURCES_CONTOUR} -# src/interface/wxWindows/wxMaracasImageBrowser02.cxx -# src/interface/wxWindows/widgets/wxReadingPriorityPanel.cpp - #src/interface/wxWindows/widgets/ContourView.cxx - #src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.cxx - #src/interface/wxWindows/widgets/LineView.cxx - #src/interface/wxWindows/widgets/PointView.cxx - #src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx - #src/interface/wxWindows/widgets/vtkClosePolyData.cxx - #src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx - #src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx - #src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx - #src/interface/wxWindows/widgets/wxMaracasIRMView.cxx - #src/interface/wxWindows/widgets/wxMaracasIRMViewManager.cxx - #src/interface/wxWindows/widgets/wxMPRWidget.cxx - #src/interface/wxWindows/widgets/wxMPRBaseData.cxx - #src/interface/wxWindows/widgets/wxSTLWidget_03.cxx - #src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx - #src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx - #src/interface/wxWindows/widgets/wxVtkBaseView.cxx - ${${LIBRARY_NAME}_SOURCES_WIDGETS} - #src/interface/wxWindows/widgets/pPlotter/Histogram.cxx - #src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx - #src/interface/wxWindows/widgets/pPlotter/HistogramWidget.cxx - #src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx - #src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx - #src/interface/wxWindows/widgets/pPlotter/mathplot.cxx - #src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.cxx - #src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx - #src/interface/wxWindows/widgets/pPlotter/pColorPoint.cxx - #src/interface/wxWindows/widgets/pPlotter/pFigure.cxx - #src/interface/wxWindows/widgets/pPlotter/pFunctionPoint.cxx - #src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx - #src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx - #src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx - #src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx - #src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.cxx - #src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx - #src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx - #src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx - ${${LIBRARY_NAME}_SOURCES_PPLOTTER} - ${${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR} - -### - #src/kernel/marImageData.cpp - #src/kernel/marDicomBase.cpp -# src/kernel/marGdcmDicom.cpp - #src/kernel/marObject.cpp - #src/kernel/volume.cxx - #src/kernel/marParameters.cpp - #src/kernel/marDynData.cpp - #src/kernel/vtkSTLExtractor.cpp + ${${LIBRARY_NAME}_SOURCES_CONTOUR} + ${${LIBRARY_NAME}_SOURCES_ThresholdImageView} + ${${LIBRARY_NAME}_SOURCES_WIDGETS} + ${${LIBRARY_NAME}_SOURCES_PPLOTTER} + ${${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR} ${${LIBRARY_NAME}_SOURCES_KERNEL} ) #---------------------------------------------------------------------------- @@ -283,6 +168,7 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS lib/maracasVisuLib/src/interface/wxWindows/widgets lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour + lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView lib/maracasVisuLib/../../../ ) IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) @@ -310,6 +196,8 @@ ENDIF(UNIX) # ${PROJECT_SOURCE_DIR}/src/AdditionalUsecreaImageIO.cmake.in) # Invoke the advanced macro + + CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME}) # INSTALLS LIBRARY @@ -326,13 +214,10 @@ ELSE(WIN32) TARGETS ${LIBRARY_NAME} DESTINATION lib) ENDIF(WIN32) - - - - #---------------------------------------------------------------------------- - #--------------------------------------------------------------------------- ENDIF ( BUILD_${LIBRARY_NAME} ) + +SUBDIRS(src)