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 + buildtools/appveyor.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3