From 7f9b5ada6946677682c415ae7d8d57ed725b30cf Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 6 Dec 2022 13:16:17 +0100 Subject: [PATCH] [build,ci] fix address sanitizer setting for ci --- ci/cmake-preloads/config-android.txt | 2 +- ci/cmake-preloads/config-debian-squeeze.txt | 2 +- ci/cmake-preloads/config-linux-all.txt | 2 +- ci/cmake-preloads/config-macosx.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/cmake-preloads/config-android.txt b/ci/cmake-preloads/config-android.txt index 695c6ea03..6fdd639c3 100644 --- a/ci/cmake-preloads/config-android.txt +++ b/ci/cmake-preloads/config-android.txt @@ -1,6 +1,6 @@ message("PRELOADING android cache") set(CMAKE_TOOLCHAIN_FILE "$ANDROID_NDK/build/cmake/android.toolchain.cmake" CACHE PATH "ToolChain file") -set(WITH_SANITIZE_ADDRESS ON) +set (WITH_SANITIZE_ADDRESS ON CACHE BOOL "build with address sanitizer") set(FREERDP_EXTERNAL_SSL_PATH $ENV{ANDROID_SSL_PATH} CACHE PATH "android ssl") # ANDROID_NDK and ANDROID_SDK must be set as environment variable #set(ANDROID_NDK $ENV{ANDROID_SDK} CACHE PATH "Android NDK") diff --git a/ci/cmake-preloads/config-debian-squeeze.txt b/ci/cmake-preloads/config-debian-squeeze.txt index 6d67c8166..5f0bcfda7 100644 --- a/ci/cmake-preloads/config-debian-squeeze.txt +++ b/ci/cmake-preloads/config-debian-squeeze.txt @@ -8,5 +8,5 @@ set (WITH_FFMPEG OFF CACHE BOOL "ffmepg support") set (WITH_XV OFF CACHE BOOL "xvideo support") set (BUILD_TESTING ON CACHE BOOL "build testing") set (WITH_XSHM OFF CACHE BOOL "build with xshm support") -set (WITH_SANITIZE_ADDRESS ON) +set (WITH_SANITIZE_ADDRESS ON CACHE BOOL "build with address sanitizer") set(WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") diff --git a/ci/cmake-preloads/config-linux-all.txt b/ci/cmake-preloads/config-linux-all.txt index ba6408604..9b1552fba 100644 --- a/ci/cmake-preloads/config-linux-all.txt +++ b/ci/cmake-preloads/config-linux-all.txt @@ -48,7 +48,7 @@ set (WITH_DEBUG_X11_LOCAL_MOVESIZE OFF CACHE BOOL "enable debug") set (WITH_DEBUG_XV OFF CACHE BOOL "enable debug") set (WITH_SAMPLE ON CACHE BOOL "samples") set (WITH_NO_UNDEFINED ON CACHE BOOL "don't link with undefined symbols") -set (WITH_SANITIZE_ADDRESS ON) +set (WITH_SANITIZE_ADDRESS ON CACHE BOOL "build with address sanitizer") set (WITH_FFMPEG ON CACHE BOOL "compile ffmpeg support") set (WITH_SWSCALE OFF CACHE BOOL "compile ffmpeg support") set (WITH_DSP_FFMPEG ON CACHE BOOL "compile ffmpeg support") diff --git a/ci/cmake-preloads/config-macosx.txt b/ci/cmake-preloads/config-macosx.txt index 7a0c64df7..92195a15e 100644 --- a/ci/cmake-preloads/config-macosx.txt +++ b/ci/cmake-preloads/config-macosx.txt @@ -5,5 +5,5 @@ set (WITH_CUPS ON CACHE BOOL "CUPS printing") set (CHANNEL_URBDRC OFF CACHE BOOL "USB redirection") set (WITH_X11 ON CACHE BOOL "Enable X11") set (BUILD_TESTING ON CACHE BOOL "build testing") -set (WITH_SANITIZE_ADDRESS ON) +set (WITH_SANITIZE_ADDRESS ON CACHE BOOL "build with address sanitizer") set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options")