diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-10-25 17:19:39 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-10-25 17:19:39 +0000 |
| commit | 06092bd380bacd51f67d2f6ae859522fda43a91a (patch) | |
| tree | 7b0a64688f8349350a274af0b24dd9004864e321 /CMakeScripts | |
| parent | Allow select text elements by bounding box (diff) | |
| download | inkscape-06092bd380bacd51f67d2f6ae859522fda43a91a.tar.gz inkscape-06092bd380bacd51f67d2f6ae859522fda43a91a.zip | |
CMake/MSYS2: Fix for Python 3.8 update
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index e631464b1..9d731901d 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -37,7 +37,6 @@ if(WIN32) ${MINGW_BIN}/libenchant-[0-9]*.dll
${MINGW_BIN}/libepoxy-[0-9]*.dll
${MINGW_BIN}/libexpat-[0-9]*.dll
- ${MINGW_BIN}/libexslt-[0-9]*.dll
${MINGW_BIN}/libffi-[0-9]*.dll
${MINGW_BIN}/libfftw3-[0-9]*.dll
${MINGW_BIN}/libfontconfig-[0-9]*.dll
@@ -250,6 +249,9 @@ if(WIN32) endif()
# Python (use executable names without version number for compatibility with python from python.org)
+ file(GLOB python_version ${MINGW_BIN}/libpython3.[0-9]*.dll)
+ string(REGEX REPLACE "${MINGW_BIN}/libpython(3\.[0-9]+)\.dll" "\\1" python_version ${python_version})
+
install(FILES
${MINGW_BIN}/python3.exe
RENAME python.exe
@@ -259,16 +261,16 @@ if(WIN32) RENAME pythonw.exe
DESTINATION bin)
install(FILES
- ${MINGW_BIN}/libpython3.7m.dll
+ ${MINGW_BIN}/libpython${python_version}.dll
DESTINATION bin)
- install(DIRECTORY ${MINGW_LIB}/python3.7
+ install(DIRECTORY ${MINGW_LIB}/python${python_version}
DESTINATION lib
- PATTERN "python3.7/site-packages" EXCLUDE # specify individual packages to install below
- PATTERN "python3.7/test" EXCLUDE # we don't need the Python testsuite
+ PATTERN "python${python_version}/site-packages" EXCLUDE # specify individual packages to install below
+ PATTERN "python${python_version}/test" EXCLUDE # we don't need the Python testsuite
PATTERN "*.pyc" EXCLUDE
)
- set(site_packages "lib/python3.7/site-packages")
+ set(site_packages "lib/python${python_version}/site-packages")
# Python packages installed via pacman
set(packages "python3-lxml" "python3-numpy" "python3-pillow" "python3-six" "python3-cairo" "python3-gobject")
foreach(package ${packages})
|