Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

vtk: try to fix the build

Browse Source 
patches taken from gentoo:
https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/vtk/files
This commit is contained in:
Christoph Reiter
2021-01-03 12:05:07 +01:00
parent 47420a41a5
commit 404e1ec83f
6 changed files with 137 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mingw-w64-vtk/008-fix-python-modules-path.patch
View File

@@ -37,8 +37,8 @@
ver = sys.version[0:3]
purelib = prefix+'/lib/python'+ver+'/site-packages'
platlib = exec_prefix+'/lib/python'+ver+'/site-packages'
--- VTK-8.2.0/CMake/FindPythonLibs.cmake.orig 2019-05-22 15:23:02.502137600 +0300
+++ VTK-8.2.0/CMake/FindPythonLibs.cmake 2019-05-22 15:24:36.966270100 +0300
--- VTK-8.2.0/CMake/FindPythonLibs.cmake.orig 2019-01-30 18:15:13.000000000 +0100
+++ VTK-8.2.0/CMake/FindPythonLibs.cmake 2021-01-03 10:14:54.693475800 +0100
@@ -32,7 +32,7 @@
# Use the executable's path as a hint
set(_Python_LIBRARY_PATH_HINT)
@@ -53,7 +53,7 @@
set(_Python_VERSIONS
${Python_ADDITIONAL_VERSIONS} ${_PythonInterp_VERSION}
- 2.7 2.6 2.5 3.6 3.5 3.4 3.3 3.2)
+ 2.7 2.6 2.5 3.7 3.6 3.5 3.4 3.3 3.2)
+ 2.7 2.6 2.5 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2)
foreach(_CURRENT_VERSION ${_Python_VERSIONS})
string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
@@ -62,3 +62,14 @@
find_library(PYTHON_DEBUG_LIBRARY
NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
HINTS ${_Python_LIBRARY_PATH_HINT}
@@ -102,10 +102,6 @@
python${_CURRENT_VERSION}
HINTS
${_Python_LIBRARY_PATH_HINT}
- PATHS
- ${PYTHON_FRAMEWORK_LIBRARIES}
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
- [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
# Avoid finding the .dll in the PATH. We want the .lib.
NO_SYSTEM_ENVIRONMENT_PATH
)