summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2018-09-10 11:21:09 +0000
committerEduard Braun <eduard.braun2@gmx.de>2018-09-10 11:21:09 +0000
commit15533eeb2fe0073736b30fe4ab6137ef4934dd9a (patch)
tree92db767e616a0909639e3d0a10d027713f112d9c
parentUpdate extensions (diff)
downloadinkscape-15533eeb2fe0073736b30fe4ab6137ef4934dd9a.tar.gz
inkscape-15533eeb2fe0073736b30fe4ab6137ef4934dd9a.zip
CMake/MSYS2: Properly disable jemalloc for all builds
-rw-r--r--CMakeScripts/ConfigEnv.cmake1
-rw-r--r--buildtools/appveyor.sh1
2 files changed, 1 insertions, 1 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/buildtools/appveyor.sh b/buildtools/appveyor.sh
index e4a89124a..649de66ba 100644
--- a/buildtools/appveyor.sh
+++ b/buildtools/appveyor.sh
@@ -53,7 +53,6 @@ cmake .. -G Ninja \
-DCMAKE_C_COMPILER_LAUNCHER="ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
-DCMAKE_INSTALL_MESSAGE="NEVER" \
- -DWITH_JEMALLOC="OFF" \
|| error "cmake failed"
# build