diff --git a/Modules/DiffusionImaging/Connectomics/CMakeLists.txt b/Modules/DiffusionImaging/Connectomics/CMakeLists.txt index 3099bee..e310934 100644 --- a/Modules/DiffusionImaging/Connectomics/CMakeLists.txt +++ b/Modules/DiffusionImaging/Connectomics/CMakeLists.txt @@ -1,8 +1,8 @@ MITK_CREATE_MODULE( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion INCLUDE_DIRS Algorithms Algorithms/BrainParcellation IODataStructures Rendering ${CMAKE_CURRENT_BINARY_DIR} DEPENDS MitkDiffusionCore MitkFiberTracking PACKAGE_DEPENDS VTK|vtkInfovisLayout ) add_subdirectory(Testing) diff --git a/Modules/DiffusionImaging/DiffusionCmdApps/CMakeLists.txt b/Modules/DiffusionImaging/DiffusionCmdApps/CMakeLists.txt index ffbde72..0c121b8 100644 --- a/Modules/DiffusionImaging/DiffusionCmdApps/CMakeLists.txt +++ b/Modules/DiffusionImaging/DiffusionCmdApps/CMakeLists.txt @@ -1,20 +1,20 @@ MITK_CREATE_MODULE( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion # INCLUDE_DIRS Helpers DEPENDS MitkDiffusionCore MitkDiffusionIO MitkFiberTracking MitkQuantification MitkConnectomics PACKAGE_DEPENDS PUBLIC ITK ) if(MODULE_IS_ENABLED) add_subdirectory(Connectomics) add_subdirectory(Fiberfox) add_subdirectory(FiberProcessing) add_subdirectory(Tractography) add_subdirectory(TractographyEvaluation) add_subdirectory(Misc) add_subdirectory(Quantification) if(MITK_USE_Python) add_subdirectory(Python) endif() endif() diff --git a/Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt b/Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt index a3151db..e391570 100644 --- a/Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt +++ b/Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt @@ -1,24 +1,24 @@ # With apple gcc 4.2.1 the following waring leads to an build error if boost is enabled if(APPLE) mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=empty-body" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) endif() MITK_CREATE_MODULE( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion INCLUDE_DIRS include/ include/Algorithms include/Algorithms/Reconstruction include/Algorithms/Registration include/Algorithms/Reconstruction/MultishellProcessing include/Algorithms/Reconstruction/FittingFunctions include/DicomImport include/IODataStructures/DiffusionWeightedImages include/IODataStructures/Properties include/IODataStructures/OdfImages include/IODataStructures/TensorImages include/IODataStructures include/Rendering ${CMAKE_CURRENT_BINARY_DIR} DEPENDS MitkMapperExt MitkPlanarFigure MitkImageExtraction MitkSceneSerializationBase MitkDICOMReader MitkMatchPointRegistration PACKAGE_DEPENDS PUBLIC ITK|ITKTestKernel+ITKRegistrationCommon+ITKMetricsv4+ITKRegistrationMethodsv4+ITKDistanceMap+ITKLabelVoting+ITKVTK PUBLIC VTK|vtkFiltersProgrammable OpenMP|OpenMP_CXX ) if(MSVC) mitkFunctionCheckCAndCXXCompilerFlags("/wd4005" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) endif() add_subdirectory(Testing) add_subdirectory(autoload/IO) if(MITK_USE_Python) MITK_INSTALL(FILES PythonRequirements.txt) endif() diff --git a/Modules/DiffusionImaging/DiffusionCore/autoload/IO/CMakeLists.txt b/Modules/DiffusionImaging/DiffusionCore/autoload/IO/CMakeLists.txt index 81ada99..b400054 100644 --- a/Modules/DiffusionImaging/DiffusionCore/autoload/IO/CMakeLists.txt +++ b/Modules/DiffusionImaging/DiffusionCore/autoload/IO/CMakeLists.txt @@ -1,9 +1,9 @@ MITK_CREATE_MODULE( DiffusionCoreIO INCLUDE_DIRS PRIVATE src/IO DEPENDS PUBLIC MitkDiffusionCore MitkSceneSerialization PACKAGE_DEPENDS PRIVATE tinyxml AUTOLOAD_WITH MitkCore - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion ) \ No newline at end of file diff --git a/Modules/DiffusionImaging/DiffusionIO/CMakeLists.txt b/Modules/DiffusionImaging/DiffusionIO/CMakeLists.txt index fbe0235..5723bab 100644 --- a/Modules/DiffusionImaging/DiffusionIO/CMakeLists.txt +++ b/Modules/DiffusionImaging/DiffusionIO/CMakeLists.txt @@ -1,8 +1,8 @@ MITK_CREATE_MODULE( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} DEPENDS MitkConnectomics MitkQuantification MitkFiberTracking AUTOLOAD_WITH MitkCore PACKAGE_DEPENDS PUBLIC DCMTK ) diff --git a/Modules/DiffusionImaging/FiberTracking/CMakeLists.txt b/Modules/DiffusionImaging/FiberTracking/CMakeLists.txt index 6907c24..53893cf 100644 --- a/Modules/DiffusionImaging/FiberTracking/CMakeLists.txt +++ b/Modules/DiffusionImaging/FiberTracking/CMakeLists.txt @@ -1,47 +1,47 @@ set(_module_deps MitkDiffusionCore MitkGraphAlgorithms MitkCLVigraRandomForest) mitk_check_module_dependencies( MODULES ${_module_deps} MISSING_DEPENDENCIES_VAR _missing_deps ) if(NOT _missing_deps) set(lut_url http://mitk.org/download/data/FibertrackingLUT.tar.gz) set(lut_tarball ${CMAKE_CURRENT_BINARY_DIR}/FibertrackingLUT.tar.gz) file(DOWNLOAD ${lut_url} ${lut_tarball} EXPECTED_MD5 38ecb6d4a826c9ebb0f4965eb9aeee44 TIMEOUT 60 STATUS status SHOW_PROGRESS ) list(GET status 0 status_code) list(GET status 1 status_msg) if(NOT status_code EQUAL 0) message(SEND_ERROR "${status_msg} (error code ${status_code})") endif() file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Resources) execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ../FibertrackingLUT.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Resources RESULT_VARIABLE result ERROR_VARIABLE err_msg) if(result) message(SEND_ERROR "Unpacking FibertrackingLUT.tar.gz failed: ${err_msg}") endif() endif() MITK_CREATE_MODULE( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion INCLUDE_DIRS Fiberfox Fiberfox/SignalModels Fiberfox/Sequences Algorithms Algorithms/TrackingHandlers Algorithms/ClusteringMetrics Algorithms/GibbsTracking Algorithms/StochasticTracking IODataStructures IODataStructures/FiberBundle IODataStructures/PlanarFigureComposite Rendering ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${_module_deps} PACKAGE_DEPENDS PUBLIC ITK|ITKFFT ITK|ITKDiffusionTensorImage Vigra HDF5 OpenMP|OpenMP_CXX ) if(MODULE_IS_ENABLED) add_subdirectory(Testing) endif() diff --git a/Modules/DiffusionImaging/Quantification/CMakeLists.txt b/Modules/DiffusionImaging/Quantification/CMakeLists.txt index d3b6e84..67367c3 100644 --- a/Modules/DiffusionImaging/Quantification/CMakeLists.txt +++ b/Modules/DiffusionImaging/Quantification/CMakeLists.txt @@ -1,14 +1,14 @@ # With apple gcc 4.2.1 the following waring leads to an build error if boost is enabled if(APPLE) mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=empty-body" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) endif() #DiffusionImaging/Quantification MITK_CREATE_MODULE( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion INCLUDE_DIRS Algorithms IODataStructures IODataStructures/TbssImages Rendering ${CMAKE_CURRENT_BINARY_DIR} DEPENDS MitkDiffusionCore MitkFiberTracking MitkGraphAlgorithms PACKAGE_DEPENDS ITK|ITKThresholding ) add_subdirectory(Testing) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/CMakeLists.txt index e440872..b43f403 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.connectomics/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_connectomics) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_CONNECTOMICS_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkQtWidgetsExt MitkConnectomics ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/CMakeLists.txt index 159cd23..4c143bc 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.denoising/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_denoising) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_DENOISING_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkDiffusionCore MitkImageDenoising ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/CMakeLists.txt index dcf135c..ffd3375 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_fiberfox) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_FIBERFOX_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkFiberTracking ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt index 35b0da5..c06c70a 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_fiberprocessing) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_FIBERPROCESSING_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkFiberTracking MitkChart MitkMultilabel ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/CMakeLists.txt index 654e260..e64c95d 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.ivim/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_ivim) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_IVIM_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkQtWidgetsExt MitkQuantification ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/CMakeLists.txt index a5d7534..4ac8dcd 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_odfpeaks) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_ODFPEAKS_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkFiberTracking ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.partialvolume/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.partialvolume/CMakeLists.txt index d944180..3aaaf92 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.partialvolume/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.partialvolume/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_partialvolume) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_PARTIALVOLUME_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkQtWidgetsExt MitkDiffusionCore MitkFiberTracking ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/CMakeLists.txt index 341222a..82155d1 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/CMakeLists.txt @@ -1,11 +1,11 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_preprocessing) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_PREPROCESSING_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkDiffusionCore PACKAGE_DEPENDS Qt5|Network ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.python/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.python/CMakeLists.txt index 7ab1179..7c3281f 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.python/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.python/CMakeLists.txt @@ -1,18 +1,18 @@ if(MITK_USE_Python) # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_python) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_PREPROCESSING_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkDiffusionCore MitkPython PACKAGE_DEPENDS Qt5|Network BetData ) #set(_install_DESTINATION "BetData") MITK_INSTALL(DIRECTORY ${BetData_DIR}/) endif() diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/CMakeLists.txt index 5f0e2f5..b4491df 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.reconstruction/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_reconstruction) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_RECONSTRUCTION_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkQtWidgetsExt MitkQuantification ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/CMakeLists.txt index a0dd626..571a371 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.registration/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.registration/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_registration) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_REGISTRATION_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkDiffusionCore MitkMatchPointRegistration MitkMatchPointRegistrationUI ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tbss/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.tbss/CMakeLists.txt index cda45e0..f3e90a3 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.tbss/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tbss/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_tbss) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_TBSS_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkQtWidgetsExt MitkFiberTracking MitkQuantification ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/CMakeLists.txt index 095d4e2..6f56b7e 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.tractography/CMakeLists.txt @@ -1,11 +1,11 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_tractography) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_TRACTOGRAPHY_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkFiberTracking PACKAGE_DEPENDS Vigra HDF5 ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt index 7c8c92b..4cab76a 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt @@ -1,8 +1,8 @@ project(org_mitk_gui_qt_diffusionimaging) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkDiffusionCore MitkQuantification MitkConnectomics ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt index 80a7415..2c239d7 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt @@ -1,9 +1,9 @@ project(org_mitk_gui_qt_diffusionimagingapp) mitk_create_plugin( - SUBPROJECTS MITK-DTI + SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_APP_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDS MitkQtWidgets MitkSceneSerialization PACKAGE_DEPENDS Qt5|WebEngineWidgets )