X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=47ab8c197c3cf909a4562a1d321c7db958e25f20;hb=540c5242ac6cd8ab330f1642b0fc82e3b49d20db;hp=581d8d748e1ee7fa337c04cc5519b2e048942a21;hpb=83580670dedeba1b2f226a79eaf48b4740e5d440;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index 581d8d7..47ab8c1 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -1,17 +1,17 @@ #---------------------------------------------------------------------------- # SET THE NAME OF YOUR LIBRARY -SET ( LIBRARY_NAME maracasVisuLib ) +SET ( LIBRARY_NAME creaMaracasVisu ) #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- # CREATES A USER OPTION IN CMAKE OPTION ( BUILD_${LIBRARY_NAME} "Build ${LIBRARY_NAME} library ?" ON) -#OPTION ( EXPORTS_MaracasKernel "Build ${LIBRARY_NAME} library ?" ON) -#IF (EXPORTS_MaracasKernel) -# SET(MaracasKernel_EXPORTS) -# ADD_DEFINITIONS (-DMaracasKernel_EXPORTS) -#ENDIF(EXPORTS_MaracasKernel) +OPTION ( EXPORTS_MaracasKernel "Build ${LIBRARY_NAME} library ?" ON) +IF (EXPORTS_MaracasKernel) + SET(MaracasKernel_EXPORTS) + ADD_DEFINITIONS (-DMaracasKernel_EXPORTS) +ENDIF(EXPORTS_MaracasKernel) #---------------------------------------------------------------------------- IF ( BUILD_${LIBRARY_NAME} ) @@ -29,12 +29,13 @@ IF ( BUILD_${LIBRARY_NAME} ) src/kernel #${MARACAS_SOURCE_DIR}/src/SnakeIsoContour+Deriche src/interface/wxWindows + src/interface/wxWindows/Contour src/interface/wxWindows/widgets src/interface/wxWindows/widgets/pPlotter ../../../ ) #message(jhcl\n\n ${crea_LIBRARIES}) - INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake) + #INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake) #SET(CREA_LIBRARIES C:/creaBin/Debug/crea.lib) #FIND_PACKAGE(crea) #jhcl-End=========================================================================== @@ -46,6 +47,7 @@ IF ( BUILD_${LIBRARY_NAME} ) SET ( ${LIBRARY_NAME}_HEADERS src/interface/wxWindows/manualContour.h src/interface/wxWindows/Contour/ContourCrownWidget.h + src/interface/wxWindows/Contour/ContourExtractData.h src/interface/wxWindows/Contour/ContourVOIWidget.h src/interface/wxWindows/Contour/Propagation.h src/interface/wxWindows/Contour/ExtractControlPoints2D.h @@ -53,9 +55,9 @@ IF ( BUILD_${LIBRARY_NAME} ) src/interface/wxWindows/Contour/ContourPropagation.h src/interface/wxWindows/Contour/contoursIntersection.h src/interface/wxWindows/Contour/vectorFunctions.h - src/interface/wxWindows/wxMaracasImageBrowser02.h - src/interface/wxWindows/widgets/wxReadingPriorityPanel.h - src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h +## src/interface/wxWindows/wxMaracasImageBrowser02.h +## src/interface/wxWindows/widgets/wxReadingPriorityPanel.h + src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h src/interface/wxWindows/widgets/vtkClosePolyData.h src/interface/wxWindows/wxMaracasMPR.h @@ -64,6 +66,10 @@ IF ( BUILD_${LIBRARY_NAME} ) src/interface/wxWindows/widgets/wxVtkBaseView.h src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h + + src/interface/wxWindows/widgets/wxMaracasIRMView.h + src/interface/wxWindows/widgets/wxMaracasIRMViewManager.h + src/interface/wxWindows/wxMaracas_ManualTree_MPR.h src/interface/wxWindows/widgets/wxManualTree_MPRWidget.h src/interface/wxWindows/widgets/ContourView.h @@ -89,15 +95,18 @@ IF ( BUILD_${LIBRARY_NAME} ) src/interface/wxWindows/widgets/pPlotter/mathplot.h src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.h src/interface/wxWindows/widgets/pPlotter/Histogram.h + src/interface/wxWindows/widgets/wxSTLWidget_03.h include/matrix.h src/kernel/marImageData.h src/kernel/marDicomBase.h - src/kernel/marGdcmDicom.h + # src/kernel/marGdcmDicom.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.cpp ) #---------------------------------------------------------------------------- @@ -117,9 +126,14 @@ IF ( BUILD_${LIBRARY_NAME} ) src/interface/wxWindows/Contour/ContourPropagation.cxx src/interface/wxWindows/Contour/contoursIntersection.cxx src/interface/wxWindows/Contour/vectorFunctions.cxx - src/interface/wxWindows/wxMaracasImageBrowser02.cxx - src/interface/wxWindows/widgets/wxReadingPriorityPanel.cpp +# src/interface/wxWindows/wxMaracasImageBrowser02.cxx +# src/interface/wxWindows/widgets/wxReadingPriorityPanel.cpp + + src/interface/wxWindows/widgets/wxMaracasIRMView.cxx + src/interface/wxWindows/widgets/wxMaracasIRMViewManager.cxx + src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx + src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.cxx src/interface/wxWindows/widgets/vtkClosePolyData.cxx src/interface/wxWindows/wxMaracasMPR.cxx @@ -155,14 +169,16 @@ IF ( BUILD_${LIBRARY_NAME} ) src/interface/wxWindows/widgets/pPlotter/mathplot.cxx src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.cxx src/interface/wxWindows/widgets/pPlotter/Histogram.cxx + src/interface/wxWindows/widgets/wxSTLWidget_03.cxx ### src/kernel/marImageData.cpp src/kernel/marDicomBase.cpp - src/kernel/marGdcmDicom.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 ) #---------------------------------------------------------------------------- #jhcl-Start=========================================================================== @@ -176,7 +192,7 @@ IF ( BUILD_${LIBRARY_NAME} ) ${WXWIDGETS_LIBRARIES} ${VTK_LIBRARIES} ${ITK_LIBRARIES} - ${GDCM_LIBRARIES} +# ${GDCM_LIBRARIES} # ${BOOST_LIBRARIES} #jhcl-Start=========================================================================== @@ -205,11 +221,9 @@ IF ( BUILD_${LIBRARY_NAME} ) ENDIF(CREA_VERBOSE_CMAKE) - # MANAGE SHARED LIB - CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME}) - + # CREATE THE TARGET - ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES}) + ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS}) # LINK TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES}) @@ -232,19 +246,26 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS lib/maracasVisuLib/src/kernel #${MARACAS_SOURCE_DIR}/src/SnakeIsoContour+Deriche lib/maracasVisuLib/src/interface/wxWindows + lib/maracasVisuLib/src/interface/wxWindows/Contour lib/maracasVisuLib/src/interface/wxWindows/widgets lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter lib/maracasVisuLib/../../../ ) +IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) + SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".") +ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) + FILE(RELATIVE_PATH + CILFC_EXECUTABLE_OUTPUT_REL_PATH + ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH}) +ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} ) IF(UNIX) SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS - ${EXECUTABLE_OUTPUT_REL_PATH}) + ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib) ELSE(UNIX) SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS - ${EXECUTABLE_OUTPUT_REL_PATH}/Debug - ${EXECUTABLE_OUTPUT_REL_PATH}/Release) + ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}) SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin) ENDIF(UNIX) SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME}) @@ -262,9 +283,16 @@ INSTALL( FILES ${${LIBRARY_NAME}_HEADERS} DESTINATION ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS} ) -INSTALL( - TARGETS ${LIBRARY_NAME} - DESTINATION lib) +IF(WIN32) + INSTALL( + TARGETS ${LIBRARY_NAME} + DESTINATION bin) +ELSE(WIN32) + INSTALL( + TARGETS ${LIBRARY_NAME} + DESTINATION lib) +ENDIF(WIN32) +