Diffusion MITK 8b5a0b15759e

Merge remote-tracking branch 'origin/bug-18605-modern-cmake-and-cxx11' into…
8b5a0b15759e
Actions

Description

Merge remote-tracking branch 'origin/bug-18605-modern-cmake-and-cxx11' into bug-18605-modern-cmake-and-cxx11

Conflicts:
CMake/mitkFunctionCreateModule.cmake

Details

Provenance

zelzer

Authored on Feb 11 2015, 12:18 AM

Parents

rMITKe6ca351aa10d: Fixed issues when using MITK as an external project.
rMITK4b2b9589856c: COMP: Fixed Boost configure command syntax (works for both, paths with and…

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITK8b5a0b15759e: Merge remote-tracking branch 'origin/bug-18605-modern-cmake-and-cxx11' into… (authored by zelzer).Feb 11 2015, 12:18 AM

Merged Changes

4b2b9589856c COMP: Fixed Boost configure command syntax (works for both, paths with and…
Author
kislinsk
Browse Repository
No Builds
No Audits
a51f5783ad4c COMP: find_library appends a "lib" suffix which is not present for OpenCV.
Author
zelzer
Browse Repository
No Builds
No Audits
32662a3e932a COMP: OpenCVConfig.cmake cannot be included in ctest script mode.
Author
zelzer
Browse Repository
No Builds
No Audits
bb3e83ccf9ad COMP: Don't use MITK_USE variables of external projects in the setup script.
Author
zelzer
Browse Repository
No Builds
No Audits
ff67313f67ba COMP: Fixed subtle memory management bug in pic file reader.
Author
zelzer
Browse Repository
No Builds
No Audits
b1d983f7f14c COMP: Fixed external proj dependency handling and removed unnecessary
Author
zelzer
Browse Repository
No Builds
No Audits
c4cf3cfb7c16 Merge branch 'bug-18605-add-opencv-path-to-dashboard-setup' into bug-18605…
Author
kislinsk
Browse Repository
No Builds
No Audits
3b9470653242 COMP: Add OpenCV path to dashboard setup.
Author
kislinsk
Browse Repository
No Builds
No Audits
5267eb179408 Merge branch 'bug-18605-modern-cmake-and-cxx11'
Author
zelzer
Browse Repository
No Builds
No Audits
0c2718781e5d COMP: Removed duplicate test entry.
Author
zelzer
Browse Repository
No Builds
No Audits
da1639ddfaf6 Merge branch 'bug-18605-opencv-library-search-paths'
Author
kislinsk
Browse Repository
No Builds
No Audits
fedf7ebcc17b COMP: Handle OpenCV library search paths.
Author
kislinsk
Browse Repository
No Builds
No Audits
9e2e011a85f2 Merge branch 'bug-18605-revert-opencv-install-prefix'
Author
kislinsk
Browse Repository
No Builds
No Audits
ad343146fe39 COMP: OpenCV find module require libraries to be located in arch specific…
Author
kislinsk
Browse Repository
No Builds
No Audits
d01a7eff25e5 Merge branch 'bug-18725-ConversionError'
Author
neher
Browse Repository
No Builds
No Audits
eea3537f68f8 COMP: using itk numeric traits
Author
neher
Browse Repository
No Builds
No Audits
8360d40767a9 Merge branch 'bug-18725-ConversionError'
Author
neher
Browse Repository
No Builds
No Audits
ab7598315af5 COMP: using itk numeric traits
Author
neher
Browse Repository
No Builds
No Audits
f0f587d50705 Merge branch 'bug-18725-ConversionError'
Author
neher
Browse Repository
No Builds
No Audits
7a0a03ec61bb COMP: using itk numeric traits
Author
neher
Browse Repository
No Builds
No Audits
f3bb54f9b2ee Merge branch 'bug-18725-ConversionError'
Author
neher
Browse Repository
No Builds
No Audits
6299c36eae4e COMP: using itk numeric traits
Author
neher
Browse Repository
No Builds
No Audits
98a3ae8960a2 Merge branch 'bug-18605-opencv-install-prefix'
Author
kislinsk
Browse Repository
No Builds
No Audits
baa3c0bae73c COMP: Install OpenCV directly into ep/lib and ep/bin for Windows.
Author
kislinsk
Browse Repository
No Builds
No Audits
8ccc0e417dad Merge branch 'bug-18605-cmake-library-and-include-path'
Author
kislinsk
Browse Repository
No Builds
No Audits
dce943a81fcf COMP: Pass CMAKE_LIBRARY_PATH and CMAKE_INCLUDE_PATH from superbuild to MITK…
Author
kislinsk
Browse Repository
No Builds
No Audits
2765c76a2c3a Merge branch 'bug-18605-modern-cmake-and-cxx11'
Author
zelzer
Browse Repository
No Builds
No Audits
fd0ba38aeb49 COMP: Removed wrong install name dir.
Author
zelzer
Browse Repository
No Builds
No Audits
e90da2ac6cb1 COMP: Fixed again resource path for unit test.
Author
zelzer
Browse Repository
No Builds
No Audits
28871d61c112 Merge branch 'bug-18605-modern-cmake-and-cxx11'
Author
zelzer
Browse Repository
No Builds
No Audits
5fdb1d27d61c COMP: Read build configurations before custom dependency logic.
Author
zelzer
Browse Repository
No Builds
No Audits
f144ca93a552 COMP: Figure out Qt binary install path for finding qhelpgenerator.
Author
zelzer
Browse Repository
No Builds
No Audits
58da5ce004ff COMP: OpenCL is a public dependency of MitkOpenCL.
Author
zelzer
Browse Repository
No Builds
No Audits
fac483cbb26a COMP: Make Boost super-build work with spaces in path names.
Author
zelzer
Browse Repository
No Builds
No Audits
651178f40e20 COMP: Fixed C++11 compiler flag handling and VCL bug for gcc 4.6.
Author
zelzer
Browse Repository
No Builds
No Audits
ea7e941db36b COMP: Correctly consider current option value.
Author
zelzer
Browse Repository
No Builds
No Audits
d7edad8966f1 Merge branch 'bug-18605-modern-cmake-and-cxx11'
Author
zelzer
Browse Repository
No Builds
No Audits
e6cb9c331a6f Merge branch 'bug-18714-FiberBundleReaderWriter2'
Author
neher
Browse Repository
No Builds
No Audits
5d814127f2a0 COMP: removed vtk as fiber format
Author
neher
Browse Repository
No Builds
No Audits
6601d1dbe669 Merge branch 'bug-18380-OpenIGTLink-integration'
Author
zelzer
Browse Repository
No Builds
No Audits
8220cdac0e15 COMP: Added missing build config subdir
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (37)

Path

Size

Packages

CMake/

MITKDashboardSetup.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_ACVD_Config.cmake

O1: MITK Reviewer Group I

MITK_ANN_Config.cmake

O1: MITK Reviewer Group I

MITK_Boost_Config.cmake

O1: MITK Reviewer Group I

MITK_CTK_Config.cmake

O1: MITK Reviewer Group I

MITK_CppUnit_Config.cmake

O1: MITK Reviewer Group I

MITK_DCMTK_Config.cmake

O1: MITK Reviewer Group I

MITK_Eigen_Config.cmake

O1: MITK Reviewer Group I

MITK_GDCM_Config.cmake

O1: MITK Reviewer Group I

MITK_GLEW_Config.cmake

O1: MITK Reviewer Group I

MITK_GLUT_Config.cmake

O1: MITK Reviewer Group I

MITK_Numpy_Config.cmake

O1: MITK Reviewer Group I

MITK_OpenCL_Config.cmake

O1: MITK Reviewer Group I

MITK_OpenCV_Config.cmake

O1: MITK Reviewer Group I

MITK_OpenIGTLink_Config.cmake

O1: MITK Reviewer Group I

MITK_PythonLibs_Config.cmake

O1: MITK Reviewer Group I

MITK_Qwt_Config.cmake

O1: MITK Reviewer Group I

MITK_Redland_Config.cmake

O1: MITK Reviewer Group I

MITK_SOFA_Config.cmake

O1: MITK Reviewer Group I

MITK_SimpleITK_Config.cmake

O1: MITK Reviewer Group I

MITK_tinyxml_Config.cmake

O1: MITK Reviewer Group I

mitkFunctionAddExternalProject.cmake

O1: MITK Reviewer Group I

mitkFunctionGetLibrarySearchPaths.cmake

O1: MITK Reviewer Group I

CMakeExternals/

ITK-4.5.1-gcc-4.6.patch

O1: MITK Reviewer Group I

ITK.cmake

O1: MITK Reviewer Group I

Raptor2.cmake

O1: MITK Reviewer Group I

Rasqal.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

Core/

test/

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

CppMicroServices/

core/

src/

util/

usListenerFunctors_p.h

O1: MITK Reviewer Group I

DiffusionImaging/

DiffusionIO/

mitkDiffusionIOMimeTypes.cpp

IpPicSupportIO/

Internal/

mitkPicFileReader.cpp

LegacyAdaptors/

mitkLegacyAdaptors.cpp

OpenCL/

CMakeLists.txt

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkFiberProcessingView.cpp

SuperBuild.cmake

O1: MITK Reviewer Group I

rMITK8b5a0b15759e

View Options

CMake/MITKDashboardSetup.cmake

View Options

CMake/PackageDepends/MITK_ACVD_Config.cmake

View Options

CMake/PackageDepends/MITK_ANN_Config.cmake

View Options

CMake/PackageDepends/MITK_Boost_Config.cmake

View Options

CMake/PackageDepends/MITK_CTK_Config.cmake

View Options

CMake/PackageDepends/MITK_CppUnit_Config.cmake

View Options

CMake/PackageDepends/MITK_DCMTK_Config.cmake

View Options

CMake/PackageDepends/MITK_Eigen_Config.cmake

View Options

CMake/PackageDepends/MITK_GDCM_Config.cmake

View Options

CMake/PackageDepends/MITK_GLEW_Config.cmake

View Options

CMake/PackageDepends/MITK_GLUT_Config.cmake

View Options

CMake/PackageDepends/MITK_Numpy_Config.cmake

View Options

CMake/PackageDepends/MITK_OpenCL_Config.cmake

View Options

CMake/PackageDepends/MITK_OpenCV_Config.cmake

View Options

CMake/PackageDepends/MITK_OpenIGTLink_Config.cmake

View Options

CMake/PackageDepends/MITK_PythonLibs_Config.cmake

View Options

CMake/PackageDepends/MITK_Qwt_Config.cmake

View Options

CMake/PackageDepends/MITK_Redland_Config.cmake

View Options

CMake/PackageDepends/MITK_SOFA_Config.cmake

View Options

CMake/PackageDepends/MITK_SimpleITK_Config.cmake

View Options

CMake/PackageDepends/MITK_tinyxml_Config.cmake

View Options

CMake/mitkFunctionAddExternalProject.cmake

View Options

CMake/mitkFunctionGetLibrarySearchPaths.cmake

View Options

CMakeExternals/ITK-4.5.1-gcc-4.6.patch

View Options

CMakeExternals/ITK.cmake

View Options

CMakeExternals/Raptor2.cmake

View Options

CMakeExternals/Rasqal.cmake

View Options

CMakeLists.txt

View Options

Modules/Core/test/CMakeLists.txt

View Options

Modules/Core/test/files.cmake

View Options

Modules/CppMicroServices/core/src/util/usListenerFunctors_p.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

View Options

Modules/IpPicSupportIO/Internal/mitkPicFileReader.cpp

View Options

Modules/LegacyAdaptors/mitkLegacyAdaptors.cpp

View Options

Modules/OpenCL/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp

View Options

Merge remote-tracking branch 'origin/bug-18605-modern-cmake-and-cxx11' into…8b5a0b15759eActions

Description

Details

Event Timeline

Merged Changes

Changes (37)

rMITK8b5a0b15759e

CMake/MITKDashboardSetup.cmake

CMake/PackageDepends/MITK_ACVD_Config.cmake

CMake/PackageDepends/MITK_ANN_Config.cmake

CMake/PackageDepends/MITK_Boost_Config.cmake

CMake/PackageDepends/MITK_CTK_Config.cmake

CMake/PackageDepends/MITK_CppUnit_Config.cmake

CMake/PackageDepends/MITK_DCMTK_Config.cmake

CMake/PackageDepends/MITK_Eigen_Config.cmake

CMake/PackageDepends/MITK_GDCM_Config.cmake

CMake/PackageDepends/MITK_GLEW_Config.cmake

CMake/PackageDepends/MITK_GLUT_Config.cmake

CMake/PackageDepends/MITK_Numpy_Config.cmake

CMake/PackageDepends/MITK_OpenCL_Config.cmake

CMake/PackageDepends/MITK_OpenCV_Config.cmake

CMake/PackageDepends/MITK_OpenIGTLink_Config.cmake

CMake/PackageDepends/MITK_PythonLibs_Config.cmake

CMake/PackageDepends/MITK_Qwt_Config.cmake

CMake/PackageDepends/MITK_Redland_Config.cmake

CMake/PackageDepends/MITK_SOFA_Config.cmake

CMake/PackageDepends/MITK_SimpleITK_Config.cmake

CMake/PackageDepends/MITK_tinyxml_Config.cmake

CMake/mitkFunctionAddExternalProject.cmake

CMake/mitkFunctionGetLibrarySearchPaths.cmake

CMakeExternals/ITK-4.5.1-gcc-4.6.patch

CMakeExternals/ITK.cmake

CMakeExternals/Raptor2.cmake

CMakeExternals/Rasqal.cmake

CMakeLists.txt

Modules/Core/test/CMakeLists.txt

Modules/Core/test/files.cmake

Modules/CppMicroServices/core/src/util/usListenerFunctors_p.h

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

Modules/IpPicSupportIO/Internal/mitkPicFileReader.cpp

Modules/LegacyAdaptors/mitkLegacyAdaptors.cpp

Modules/OpenCL/CMakeLists.txt

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp

SuperBuild.cmake

Merge remote-tracking branch 'origin/bug-18605-modern-cmake-and-cxx11' into…
8b5a0b15759e
Actions