Merge branch 'T26437-CMake-3.14'
7172da308e72
Actions

Description

Merge branch 'T26437-CMake-3.14'

Details

Provenance

kislinsk	Authored on Jul 1 2019, 12:40 PM
kislinsk	Pushed on Jul 1 2019, 12:41 PM

Parents

rMITKced2c8feeffd: Set minimum required version of CMake to 3.14.5
rMITK4aac70592733: Merge branch 'T25033-PythonConsoleColors'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK7172da308e72: Merge branch 'T26437-CMake-3.14' (authored by kislinsk).Jul 1 2019, 12:40 PM

Merged Changes

ced2c8feeffd Set minimum required version of CMake to 3.14.5
Author
kislinsk
Browse Repository
No Builds
No Audits
0f8ef678c1b9 Merge remote-tracking branch 'origin/releases/2018-04' into T26437-CMake-3.14
Author
kislinsk
Browse Repository
No Builds
No Audits
f7bd07a6c604 Fixed some exception handling code to be more correct
Author
nolden
Browse Repository
No Builds
No Audits
c783c512ba1c Don't fail on gcc 9 warnings about copy ctors
Author
nolden
Browse Repository
No Builds
No Audits
53eacaea95bb Fixes for clang compilation
Author
nolden
Browse Repository
No Builds
No Audits
1e41f85102cf Set base commit rule to origin/master
Author
kislinsk
Browse Repository
No Builds
No Audits
74c6743b04b8 Make some external projects customizable
Author
kislinsk
Browse Repository
No Builds
No Audits
56f4510095c2 Merge branch 'T26426-EPCustomization' into releases/2018-04
Author
kislinsk
Browse Repository
No Builds
No Audits
5d11f7b252c0 Make ITK customizable
Author
kislinsk
Browse Repository
No Builds
No Audits
8dc104a80cb8 Add macro to query custom external project variables
Author
kislinsk
Browse Repository
No Builds
No Audits
a6c9f34731a7 Merge remote-tracking branch 'maleike/build-no-qt-designer-plugins' into…
Author
kislinsk
Browse Repository
No Builds
No Audits
395885d63939 Merge remote-tracking branch 'maleike/mitkSetupCPack-fix-quoting' into…
Author
kislinsk
Browse Repository
No Builds
No Audits
0ab131ef16c4 Add options to skip building the Qt designer plugins
Author
maleike
Browse Repository
No Builds
No Audits
642c83a462bf Fix quoting
Author
maleike
Browse Repository
No Builds
No Audits
6d9dbcf2721f Merge branch 'T26356-MisalignedRenderWindowFrames' into releases/2018-04
Author
kislinsk
Browse Repository
No Builds
No Audits
07bb5cafa74d Align segments of colored render window frames
Author
kislinsk
Browse Repository
No Builds
No Audits
5946463d32cd Merge branch 'T24860-LevelWindowInitLocation' into releases/2018-04
Author
kislinsk
Browse Repository
No Builds
No Audits
b04c4059b4a4 Merge remote-tracking branch 'maleike/T24860-default-levelwindow' into T24860…
Author
kislinsk
Browse Repository
No Builds
No Audits
b5bce84f4896 Ignore out directory
Author
kislinsk
Browse Repository
No Builds
No Audits
dd2878fc005d Remove obsolete code
Author
maleike
Browse Repository
No Builds
No Audits
9f0f39a1791b Fix initialization logic of "levelwindow"
Author
maleike
Browse Repository
No Builds
No Audits
326e4070d23b Merge branch 'T26252-BoostInstallError' into releases/2018-04
Author
kislinsk
Browse Repository
No Builds
No Audits
63119b890025 Fix install error on some machines
Author
kislinsk
Browse Repository
No Builds
No Audits
17d63687dd67 Merge remote-tracking branch 'origin/T26250-MSVC-Ninja' into releases/2018-04
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (24)

Path

Size

Packages

.gitignore

Applications/

PluginGenerator/

CMakeLists.txt

ProjectTemplate/

CMakeLists.txt

CMake/

MITKDashboardDriverScript.cmake

O1: MITK Reviewer Group I

MITKDashboardScript.TEMPLATE.cmake

O1: MITK Reviewer Group I

MITKDashboardSetup.cmake

O1: MITK Reviewer Group I

mitkMacroQueryCustomEPVars.cmake

O1: MITK Reviewer Group I

mitkSetupCPack.cmake

O1: MITK Reviewer Group I

CMakeExternals/

CTK.cmake

O1: MITK Reviewer Group I

DCMQI.cmake

O1: MITK Reviewer Group I

DCMTK.cmake

O1: MITK Reviewer Group I

GDCM.cmake

O1: MITK Reviewer Group I

ITK.cmake

O1: MITK Reviewer Group I

OpenCV.cmake

O1: MITK Reviewer Group I

OpenIGTLink.cmake

O1: MITK Reviewer Group I

Poco.cmake

O1: MITK Reviewer Group I

QwtCMakeLists.txt

O1: MITK Reviewer Group I

VTK.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

Core/

include/

vtkMitkRectangleProp.h

O1: MITK Reviewer Group I

src/

Rendering/

mitkImageVtkMapper2D.cpp

O1: MITK Reviewer Group I

vtkMitkRectangleProp.cpp

O1: MITK Reviewer Group I

MapperExt/

src/

mitkVolumeMapperVtkSmart3D.cpp

SuperBuild.cmake

O1: MITK Reviewer Group I

rMITK7172da308e72

View Options

.gitignore

View Options

Applications/PluginGenerator/CMakeLists.txt

View Options

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

View Options

CMake/MITKDashboardDriverScript.cmake

View Options

CMake/MITKDashboardScript.TEMPLATE.cmake

View Options

CMake/MITKDashboardSetup.cmake

View Options

CMake/mitkMacroQueryCustomEPVars.cmake

View Options

CMake/mitkSetupCPack.cmake

View Options

CMakeExternals/CTK.cmake

View Options

CMakeExternals/DCMQI.cmake

View Options

CMakeExternals/DCMTK.cmake

View Options

CMakeExternals/GDCM.cmake

View Options

CMakeExternals/ITK.cmake

View Options

CMakeExternals/OpenCV.cmake

View Options

CMakeExternals/OpenIGTLink.cmake

View Options

CMakeExternals/Poco.cmake

View Options

CMakeExternals/QwtCMakeLists.txt

View Options

CMakeExternals/VTK.cmake

View Options

CMakeLists.txt

View Options

Modules/Core/include/vtkMitkRectangleProp.h

View Options

Modules/Core/src/Rendering/mitkImageVtkMapper2D.cpp

View Options

Modules/Core/src/Rendering/vtkMitkRectangleProp.cpp

View Options

Modules/MapperExt/src/mitkVolumeMapperVtkSmart3D.cpp

View Options

Merge branch 'T26437-CMake-3.14'7172da308e72Actions

Description

Details

Event Timeline

Merged Changes

Changes (24)

rMITK7172da308e72

.gitignore

Applications/PluginGenerator/CMakeLists.txt

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

CMake/MITKDashboardDriverScript.cmake

CMake/MITKDashboardScript.TEMPLATE.cmake

CMake/MITKDashboardSetup.cmake

CMake/mitkMacroQueryCustomEPVars.cmake

CMake/mitkSetupCPack.cmake

CMakeExternals/CTK.cmake

CMakeExternals/DCMQI.cmake

CMakeExternals/DCMTK.cmake

CMakeExternals/GDCM.cmake

CMakeExternals/ITK.cmake

CMakeExternals/OpenCV.cmake

CMakeExternals/OpenIGTLink.cmake

CMakeExternals/Poco.cmake

CMakeExternals/QwtCMakeLists.txt

CMakeExternals/VTK.cmake

CMakeLists.txt

Modules/Core/include/vtkMitkRectangleProp.h

Modules/Core/src/Rendering/mitkImageVtkMapper2D.cpp

Modules/Core/src/Rendering/vtkMitkRectangleProp.cpp

Modules/MapperExt/src/mitkVolumeMapperVtkSmart3D.cpp

SuperBuild.cmake

Merge branch 'T26437-CMake-3.14'
7172da308e72
Actions