diff options
| author | Martin Owens <doctormo@gmail.com> | 2018-09-10 15:57:11 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2018-09-10 15:57:11 +0000 |
| commit | 88d8b781054039704afb495845c536d389afb3cb (patch) | |
| tree | 228a8075a36d520f92b491e95d2f0f0a5623733b /CMakeScripts | |
| parent | Fix bug #167900 (diff) | |
| parent | CMake: Install extensions after switch to submodule (diff) | |
| download | inkscape-88d8b781054039704afb495845c536d389afb3cb.tar.gz inkscape-88d8b781054039704afb495845c536d389afb3cb.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape into yhoshi/inkscape-bug167900
Diffstat (limited to '')
| -rw-r--r-- | CMakeScripts/ConfigEnv.cmake | 1 | ||||
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 4 |
2 files changed, 3 insertions, 2 deletions
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)
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}
|