diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-12 18:11:03 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-12 19:57:20 +0000 |
| commit | 34a81f6988701dd1df76b49876ae92ba45428ae4 (patch) | |
| tree | 776668b9e82aaf78bac617b58f31984f51ae6a60 /CMakeScripts/InstallMSYS2.cmake | |
| parent | revert `export-pdf-level` to `export-pdf-version` (diff) | |
| download | inkscape-34a81f6988701dd1df76b49876ae92ba45428ae4.tar.gz inkscape-34a81f6988701dd1df76b49876ae92ba45428ae4.zip | |
Packaging: Switch Windows distribution to Python 3.7
Diffstat (limited to '')
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 36fd94264..74135d250 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -74,6 +74,7 @@ if(WIN32) ${MINGW_BIN}/liblcms2-[0-9]*.dll
${MINGW_BIN}/liblqr-1-[0-9]*.dll
${MINGW_BIN}/liblzma-[0-9]*.dll
+ ${MINGW_BIN}/libmpdec-[0-9]*.dll
${MINGW_BIN}/libnghttp2-[0-9]*.dll
${MINGW_BIN}/libnspr[0-9]*.dll
${MINGW_BIN}/libopenblas.dll
@@ -231,27 +232,27 @@ if(WIN32) DESTINATION bin)
endif()
- # Python (a bit hacky for backwards compatibility with devlibs at this point)
+ # Python (use executable names without version number for compatibility with python from python.org)
install(FILES
- ${MINGW_BIN}/python2.exe
+ ${MINGW_BIN}/python3.exe
RENAME python.exe
DESTINATION bin)
install(FILES
- ${MINGW_BIN}/python2w.exe
+ ${MINGW_BIN}/python3w.exe
RENAME pythonw.exe
DESTINATION bin)
install(FILES
- ${MINGW_BIN}/libpython2.7.dll
+ ${MINGW_BIN}/libpython3.7m.dll
DESTINATION bin)
- install(DIRECTORY ${MINGW_LIB}/python2.7
+ install(DIRECTORY ${MINGW_LIB}/python3.7
DESTINATION lib
- PATTERN "python2.7/site-packages" EXCLUDE # specify individual packages to install below
- PATTERN "python2.7/test" EXCLUDE # we don't need the Python testsuite
+ PATTERN "python3.7/site-packages" EXCLUDE # specify individual packages to install below
+ PATTERN "python3.7/test" EXCLUDE # we don't need the Python testsuite
)
- set(site_packages "lib/python2.7/site-packages")
+ set(site_packages "lib/python3.7/site-packages")
# Python packages installed via pacman
- set(packages "python2-lxml" "python2-numpy" "python2-pillow" "python2-six")
+ set(packages "python3-lxml" "python3-numpy" "python3-pillow" "python3-six")
foreach(package ${packages})
list_files_pacman(${package} paths)
install_list(FILES ${paths}
|