Merge branch 'bug-16809-package-dependencies-with-components'
c768b4a9529c
Actions

Description

Merge branch 'bug-16809-package-dependencies-with-components'

Conflicts:
Modules/DiffusionImaging/Connectomics/CMakeLists.txt
Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt
Modules/DiffusionImaging/FiberTracking/CMakeLists.txt

Merge branch 'bug-16809-package-dependencies-with-components'c768b4a9529cActions

Description

Details

Event Timeline

Merged Changes

Changes (185)

rMITKc768b4a9529c

Applications/CoreApp/CMakeLists.txt

Applications/PluginGenerator/ProjectTemplate/Apps/TemplateApp/CMakeLists.txt

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

Applications/mitkDiffusion/CMakeLists.txt

Applications/mitkWorkbench/CMakeLists.txt

BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake

CMake/PackageDepends/MITK_Boost_Config.cmake

CMake/PackageDepends/MITK_GDCM_Config.cmake

CMake/PackageDepends/MITK_ITK_Config.cmake

CMake/PackageDepends/MITK_Qt4_Config.cmake

CMake/PackageDepends/MITK_Qt5_Config.cmake

CMake/PackageDepends/MITK_VTK_Config.cmake

CMake/PackageDepends/Qt

CMake/PackageDepends/Qt/MITK_Qt4_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5CLucene_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Concurrent_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Core_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5DBus_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Declarative_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5DesignerComponents_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Designer_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Gui_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Help_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5MultimediaWidgets_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Multimedia_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Network_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5OpenGL_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5PrintSupport_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Qml_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5QuickParticles_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5QuickTest_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Quick_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5ScriptTools_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Script_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Sensors_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5SerialPort_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Sql_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Svg_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Test_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5V8_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5WebKitWidgets_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5WebKit_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Widgets_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5X11Extras_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5XmlPatterns_Config.cmake

CMake/PackageDepends/Qt/MITK_Qt5Xml_Config.cmake

CMake/PackageDepends/Qt/create_qt_packages.sh

CMake/mitkFunctionCheckModuleDependencies.cmake

CMake/mitkFunctionCreateModule.cmake

CMake/mitkFunctionUseModules.cmake

CMake/mitkMacroCheckModule.cmake

CMake/mitkMacroCreateCTKPlugin.cmake

CMake/mitkMacroCreateExecutable.cmake

CMake/mitkMacroCreateModule.cmake

CMake/mitkMacroCreateModuleConf.cmake

CMake/mitkMacroCreateModuleTests.cmake

CMake/mitkMacroGenerateToolsLibrary.cmake

CMake/mitkMacroUseModule.cmake

CMake/mitkPackageTest.cmake

CMake/mitkSetupVariables.cmake

CMake/mitkTestDriverExtraIncludes.h.in

CMake/mitkTestPluginGenerator.cmake

CMake/mitkTestProjectTemplate.cmake

CMake/moduleConf.cmake.in

CMakeLists.txt

Core/Code/CMakeLists.txt

Core/Code/Common/mitkServiceBaseObject.h

Core/Code/Common/mitkTestCaller.h

Core/Code/Common/mitkTestFixture.h

Core/Code/Common/mitkTesting.h

Core/Code/Common/mitkTestingMacros.h

Core/Code/DataManagement/mitkPointSet.cpp

Core/Code/DataManagement/mitkSurface.cpp

Merge branch 'bug-16809-package-dependencies-with-components'
c768b4a9529c
Actions