From c2d29abfdacc07a62f49f9bde7cf9a193033af56 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 9 Sep 2018 18:04:39 +0200 Subject: MSYS2: Use system python2-six to avoid conflict with pip version --- CMakeScripts/InstallMSYS2.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeScripts') 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} -- cgit v1.2.3 From 15533eeb2fe0073736b30fe4ab6137ef4934dd9a Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 10 Sep 2018 13:21:09 +0200 Subject: CMake/MSYS2: Properly disable jemalloc for all builds --- CMakeScripts/ConfigEnv.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake index 8ae55e89a..4c537d4a3 100644 --- a/CMakeScripts/ConfigEnv.cmake +++ b/CMakeScripts/ConfigEnv.cmake @@ -30,6 +30,7 @@ if(WIN32) # Does not compile on Windows with these options. option(BR_PTHREADS "Use binreloc thread support" OFF) option(ENABLE_BINRELOC "Use AutoPackage" OFF) + option(WITH_JEMALLOC "Compile with JEMALLOC support" OFF) endif() if(APPLE) -- cgit v1.2.3