diff options
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 4 | ||||
| -rw-r--r-- | buildtools/msys2installdeps.sh | 3 |
2 files changed, 4 insertions, 3 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}
diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh index 5328faabe..f4c8346b1 100644 --- a/buildtools/msys2installdeps.sh +++ b/buildtools/msys2installdeps.sh @@ -80,7 +80,8 @@ $ARCH-python2 \ $ARCH-python2-pip \ $ARCH-python2-lxml \ $ARCH-python2-numpy \ -$ARCH-python2-pillow +$ARCH-python2-pillow \ +$ARCH-python2-six for arch in $(eval echo $ARCH); do case ${arch} in mingw-w64-i686) |