Merge branch 'bug-17836-pythoninstaller-sitk-integration'
Conflicts:
CMake/mitkFunctionGetLibrarySearchPaths.cmake
Modules/Python/Testing/mitkCopyToPythonAsItkImageTest.cpp
Description
Description
Details
Details
- Provenance
• heime Authored on Sep 15 2014, 1:23 PM - Parents
- rMITK97213fd985a9: fixed import issues for multiple target includes
rMITK0dd5e6f88544: Merge branch 'bug-18026-AddGeometryShaderSupport' - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- da29eaa8da13 added find numpy scriptAuthor
- daeff509155e fixedscript bugAuthor
- 77752a66f28d added missing braces in cmakelistAuthor
- e3c3464d9679 corrected documentationAuthor
- 4dde64839724 using zlib for pythonAuthor
- bad33cc47b32 added commentAuthor
- 0e6fc526c08c fixed autotools build for ctestAuthor
- 8d29ca0c465c removed cmake debug printsAuthor
- 44dc95b3a12a fixed build with system pythonAuthor
- 6fe4b9f1b072 fixed script errorAuthor
- 0ce753d0a692 added simpleitk install dirAuthor
- faf7dafe8d8e apple error in module cmake listAuthor
- 25f4dba9b94c build dependencies for appleAuthor
- c2231d6afdf2 windows opencv python lib installAuthor
- 3d01397ae4b2 only build pcre for unix systemsAuthor
- 997a3ce578ec removed debug printAuthor
- e7deb109ea85 added include path for sitk testAuthor
- 03e8faeb8364 cmake improvementsAuthor
- 8a0509d7f324 setting env variablesAuthor
