Diffusion MITK bf75cf4dc63e

Merge branch 'bug-18748-python-qt5' into bug-18748-python-qt5-intergration
bf75cf4dc63e
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-18748-python-qt5' into bug-18748-python-qt5-intergration

Conflicts:
CMakeExternals/Python.cmake

Details

Provenance

Authored on Apr 10 2015, 1:33 PM

Parents

rMITK4bd56067f07d: fixed paths for installer
rMITK8240ae3d1b30: Merge branch 'bug-16133-3D-interpolation-4D-support'

Branches

Unknown

Tags

Unknown

Event Timeline

• heime committed rMITKbf75cf4dc63e: Merge branch 'bug-18748-python-qt5' into bug-18748-python-qt5-intergration (authored by • heime).Apr 10 2015, 1:33 PM

Merged Changes

4bd56067f07d fixed paths for installer
Author
• brehler
Browse Repository
No Builds
No Audits
00fb47247b97 wip
Author
• brehler
Browse Repository
No Builds
No Audits
32518e58790d moved python install dir on windows
Author
• brehler
Browse Repository
No Builds
No Audits
0b2a46ef8f56 added PythonQt libary search path
Author
• brehler
Browse Repository
No Builds
No Audits
6a6d89148074 added userbase for simple itk non system python installations
Author
• heime
Browse Repository
No Builds
No Audits
11d3f2272939 fixed msvc compiler issues
Author
• brehler
Browse Repository
No Builds
No Audits
2f8e106f1357 re-enabled dicom rt and dicom ui
Author
• heime
Browse Repository
No Builds
No Audits
27a37d02da35 added quiet option on numpy build to hopefully supress the configure steps as…
Author
• heime
Browse Repository
No Builds
No Audits
660f53850d19 fix typo, force MITK_USE_SimpleITK
Author
• cordes
Browse Repository
No Builds
No Audits
ae429d74a570 enable SimpleITK package deps on APPLE
Author
• cordes
Browse Repository
No Builds
No Audits
5bd684e8031f fixed python installer forlinux
Author
• heime
Browse Repository
No Builds
No Audits
99ad59d84e87 fixed numpy include dir and package depends
Author
• heime
Browse Repository
No Builds
No Audits
b2827294f605 fixed missing site packages when using the build in runtime
Author
• heime
Browse Repository
No Builds
No Audits
1d4c693a7dbf set python versions according to MITK versions in internal python build
Author
• heime
Browse Repository
No Builds
No Audits
54597e6625f7 add dist-packages folder to the runtime search paths for the OpenCV install
Author
• heime
Browse Repository
No Builds
No Audits
821bfd8f730b remove debug print message
Author
• heime
Browse Repository
No Builds
No Audits
95850b082c00 install vtk python libraries to correct ep path
Author
• heime
Browse Repository
No Builds
No Audits
f207eefc1e4f fixed SimpleITK python. Installing it into ep directory structure
Author
• heime
Browse Repository
No Builds
No Audits
52efd2a2533a Moved from QtGui header to qt5 compatible includes
Author
• heime
Browse Repository
No Builds
No Audits

Changes (21)

Path

Size

Packages

CMake/

FindNumpy.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_Numpy_Config.cmake

O1: MITK Reviewer Group I

MITK_PythonLibs_Config.cmake

O1: MITK Reviewer Group I

mitkFunctionExternalPythonBuildStep.cmake

O1: MITK Reviewer Group I

mitkFunctionGetLibrarySearchPaths.cmake

O1: MITK Reviewer Group I

mitkFunctionInstallPython.cmake

O1: MITK Reviewer Group I

mitkMacroInstall.cmake

O1: MITK Reviewer Group I

CMakeExternals/

O1: MITK Reviewer Group I

Python-2.7.3.patch

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

SimpleITK.cmake

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

Modules/

Python/

O3: MITK Reviewer Group II

PythonPath.h.in

O3: MITK Reviewer Group II

QmitkPythonSnippets.cpp

O3: MITK Reviewer Group II

QmitkPythonTextEditor.cpp

O3: MITK Reviewer Group II

QmitkPythonVariableStackTableModel.h

O3: MITK Reviewer Group II

Testing/

O3: MITK Reviewer Group II

mitkPythonService.cpp

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.python/

src/

internal/

QmitkPythonView.cpp

O3: MITK Reviewer Group II

rMITKbf75cf4dc63e

CMake/FindNumpy.cmake

Loading...

CMake/PackageDepends/MITK_Numpy_Config.cmake

Loading...

CMake/PackageDepends/MITK_PythonLibs_Config.cmake

Loading...

CMake/mitkFunctionExternalPythonBuildStep.cmake

Loading...

CMake/mitkFunctionGetLibrarySearchPaths.cmake

Loading...

CMake/mitkFunctionInstallPython.cmake

Loading...

CMake/mitkMacroInstall.cmake

Loading...

CMakeExternals/Numpy.cmake

Loading...

CMakeExternals/Python-2.7.3.patch

Loading...

CMakeExternals/Python.cmake

Loading...

CMakeExternals/SimpleITK.cmake

Loading...

CMakeExternals/VTK.cmake

Loading...

CMakeLists.txt

Loading...

Modules/Python/CMakeLists.txt

Loading...

Modules/Python/PythonPath.h.in

Loading...

Modules/Python/QmitkPythonSnippets.cpp

Loading...

Modules/Python/QmitkPythonTextEditor.cpp

Loading...

Modules/Python/QmitkPythonVariableStackTableModel.h

Loading...

Modules/Python/Testing/CMakeLists.txt

Loading...

Modules/Python/mitkPythonService.cpp

Loading...

Plugins/org.mitk.gui.qt.python/src/internal/QmitkPythonView.cpp

Loading...