Diffusion MITK c4cf3cfb7c16

Merge branch 'bug-18605-add-opencv-path-to-dashboard-setup' into bug-18605…
c4cf3cfb7c16
Actions

Description

Merge branch 'bug-18605-add-opencv-path-to-dashboard-setup' into bug-18605-modern-cmake-and-cxx11

Details

Provenance

kislinsk

Authored on Feb 9 2015, 1:21 PM

Parents

rMITK3b9470653242: COMP: Add OpenCV path to dashboard setup.
rMITK0c2718781e5d: COMP: Removed duplicate test entry.

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITKc4cf3cfb7c16: Merge branch 'bug-18605-add-opencv-path-to-dashboard-setup' into bug-18605… (authored by kislinsk).Feb 9 2015, 1:21 PM

Merged Changes

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
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
28871d61c112 Merge branch 'bug-18605-modern-cmake-and-cxx11'
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 (5)

Path

Size

Packages

CMake/

MITKDashboardSetup.cmake

O1: MITK Reviewer Group I

mitkFunctionGetLibrarySearchPaths.cmake

O1: MITK Reviewer Group I

Modules/

DiffusionImaging/

DiffusionIO/

mitkDiffusionIOMimeTypes.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkFiberProcessingView.cpp

SuperBuild.cmake

O1: MITK Reviewer Group I

rMITKc4cf3cfb7c16

View Options

CMake/MITKDashboardSetup.cmake

View Options

CMake/mitkFunctionGetLibrarySearchPaths.cmake

View Options

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

View Options

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

View Options

Merge branch 'bug-18605-add-opencv-path-to-dashboard-setup' into bug-18605…c4cf3cfb7c16Actions

Description

Details

Event Timeline

Merged Changes

Changes (5)

rMITKc4cf3cfb7c16

CMake/MITKDashboardSetup.cmake

CMake/mitkFunctionGetLibrarySearchPaths.cmake

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

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

SuperBuild.cmake

Merge branch 'bug-18605-add-opencv-path-to-dashboard-setup' into bug-18605…
c4cf3cfb7c16
Actions