diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-09-09 16:04:39 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-09-09 16:04:39 +0000 |
| commit | c2d29abfdacc07a62f49f9bde7cf9a193033af56 (patch) | |
| tree | ff821b9d9713bd75b60710ae4ed179dc85c6701c /CMakeScripts | |
| parent | CI/AppVeyor: Adjust for submodules (diff) | |
| download | inkscape-c2d29abfdacc07a62f49f9bde7cf9a193033af56.tar.gz inkscape-c2d29abfdacc07a62f49f9bde7cf9a193033af56.zip | |
MSYS2: Use system python2-six to avoid conflict with pip version
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 1c84bd766..87c947a0f 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -243,7 +243,7 @@ if(WIN32) set(site_packages "lib/python2.7/site-packages")
# Python packages installed via pacman
- set(packages "python2-lxml" "python2-numpy" "python2-pillow")
+ set(packages "python2-lxml" "python2-numpy" "python2-pillow" "python2-six")
foreach(package ${packages})
list_files_pacman(${package} paths)
install_list(FILES ${paths}
@@ -252,7 +252,7 @@ if(WIN32) )
endforeach()
# Python packages installed via pip
- set(packages "coverage" "pyserial" "scour" "six")
+ set(packages "coverage" "pyserial" "scour")
foreach(package ${packages})
list_files_pip(${package} paths)
install_list(FILES ${paths}
|