diff --git a/ci/cmake-preloads/config-android.txt b/ci/cmake-preloads/config-android.txt index 64b732432..36db9fe31 100644 --- a/ci/cmake-preloads/config-android.txt +++ b/ci/cmake-preloads/config-android.txt @@ -6,6 +6,8 @@ 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") #set(ANDROID_SDK "${ANDROID_NDK}" CACHE PATH "android SDK") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") set(WITH_KRB5 OFF CACHE BOOL "Kerberos support") set(WITH_CLIENT_SDL OFF CACHE BOOL "SDL client") diff --git a/ci/cmake-preloads/config-coverity.txt b/ci/cmake-preloads/config-coverity.txt index f2e025926..c2add011b 100644 --- a/ci/cmake-preloads/config-coverity.txt +++ b/ci/cmake-preloads/config-coverity.txt @@ -1,4 +1,6 @@ set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(WINPR_UTILS_IMAGE_JPEG ON CACHE BOOL "preload") set(WINPR_UTILS_IMAGE_WEBP ON CACHE BOOL "preload") set(WINPR_UTILS_IMAGE_PNG ON CACHE BOOL "preload") diff --git a/ci/cmake-preloads/config-freebsd.txt b/ci/cmake-preloads/config-freebsd.txt index b16e81378..755a4ec1d 100644 --- a/ci/cmake-preloads/config-freebsd.txt +++ b/ci/cmake-preloads/config-freebsd.txt @@ -2,6 +2,8 @@ message("PRELOADING cache") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set(BUILD_TESTING_INTERNAL ON CACHE BOOL "preload") set(WITH_MANPAGES ON CACHE BOOL "preload") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "preload") set(WITH_CAIRO ON CACHE BOOL "preload") set(WITH_ALSA ON CACHE BOOL "preload") diff --git a/ci/cmake-preloads/config-ios-shared.txt b/ci/cmake-preloads/config-ios-shared.txt index 41ca459f9..0a983ebc2 100644 --- a/ci/cmake-preloads/config-ios-shared.txt +++ b/ci/cmake-preloads/config-ios-shared.txt @@ -1,4 +1,6 @@ message("PRELOADING iOS cache") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/cmake/ios.toolchain.cmake" CACHE PATH "cmake toolchain file") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "build type") diff --git a/ci/cmake-preloads/config-ios.txt b/ci/cmake-preloads/config-ios.txt index 37dae19b6..0cc967f92 100644 --- a/ci/cmake-preloads/config-ios.txt +++ b/ci/cmake-preloads/config-ios.txt @@ -1,5 +1,7 @@ message("PRELOADING iOS cache") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/cmake/ios.toolchain.cmake" CACHE PATH "cmake toolchain file") set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type") set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "iOS platform to build") diff --git a/ci/cmake-preloads/config-linux-all.txt b/ci/cmake-preloads/config-linux-all.txt index 6fb498a16..1a3063caa 100644 --- a/ci/cmake-preloads/config-linux-all.txt +++ b/ci/cmake-preloads/config-linux-all.txt @@ -1,4 +1,6 @@ message("PRELOADING cache") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set(BUILD_TESTING_INTERNAL ON CACHE BOOL "preload") set(WITH_MANPAGES ON CACHE BOOL "preload") diff --git a/ci/cmake-preloads/config-linux-alt-arch.txt b/ci/cmake-preloads/config-linux-alt-arch.txt index 4e5c7a7e1..824cfdfae 100644 --- a/ci/cmake-preloads/config-linux-alt-arch.txt +++ b/ci/cmake-preloads/config-linux-alt-arch.txt @@ -1,4 +1,6 @@ message("PRELOADING cache") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set(BUILD_TESTING_INTERNAL ON CACHE BOOL "preload") set(WITH_MANPAGES OFF CACHE BOOL "preload") diff --git a/ci/cmake-preloads/config-macosx.txt b/ci/cmake-preloads/config-macosx.txt index f5b19f5e8..ef433c066 100644 --- a/ci/cmake-preloads/config-macosx.txt +++ b/ci/cmake-preloads/config-macosx.txt @@ -1,4 +1,6 @@ message("PRELOADING mac cache") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set(WITH_MANPAGES OFF CACHE BOOL "man pages") set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type") diff --git a/ci/cmake-preloads/config-oss-fuzz.cmake b/ci/cmake-preloads/config-oss-fuzz.cmake index 34cb17067..ac9fb5a2a 100644 --- a/ci/cmake-preloads/config-oss-fuzz.cmake +++ b/ci/cmake-preloads/config-oss-fuzz.cmake @@ -1,4 +1,6 @@ message("PRELOADING cache") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set(WITH_VERBOSE_WINPR_ASSERT ON CACHE BOOL "oss fuzz") diff --git a/ci/cmake-preloads/config-qa-static.cmake b/ci/cmake-preloads/config-qa-static.cmake index 0dcb1e420..735857834 100644 --- a/ci/cmake-preloads/config-qa-static.cmake +++ b/ci/cmake-preloads/config-qa-static.cmake @@ -1,4 +1,6 @@ message("PRELOADING cache") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set(WITH_SERVER ON CACHE BOOL "qa default") set(WITH_SAMPLE ON CACHE BOOL "qa default") diff --git a/ci/cmake-preloads/config-qa.cmake b/ci/cmake-preloads/config-qa.cmake index 358872bad..990cdb6e4 100644 --- a/ci/cmake-preloads/config-qa.cmake +++ b/ci/cmake-preloads/config-qa.cmake @@ -1,4 +1,6 @@ set(BUILD_TESTING_INTERNAL ON CACHE BOOL "qa default") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") +set(CMAKE_C_FLAGS "-Wno-pre-c23-compat" CACHE STRING "preload") set(WITH_STREAMPOOL_DEBUG ON CACHE BOOL "preload") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set(ENABLE_WARNING_VERBOSE ON CACHE BOOL "preload") diff --git a/ci/cmake-preloads/config-ubuntu-1204.txt b/ci/cmake-preloads/config-ubuntu-1204.txt deleted file mode 100644 index 7e2050049..000000000 --- a/ci/cmake-preloads/config-ubuntu-1204.txt +++ /dev/null @@ -1,15 +0,0 @@ -message("PRELOADING cache") -set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") -set(WITH_MANPAGES ON CACHE BOOL "man pages") -set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type") -set(WITH_CUPS OFF CACHE BOOL "CUPS printing") -set(WITH_KRB5 ON CACHE BOOL "Kerberos support") -set(WITH_ALSA OFF CACHE BOOL "alsa audio") -set(WITH_FFMPEG OFF CACHE BOOL "ffmepg support") -set(WITH_XV OFF CACHE BOOL "xvideo support") -set(BUILD_TESTING_INTERNAL ON CACHE BOOL "build testing") -set(WITH_XSHM OFF CACHE BOOL "build with xshm support") -set(WITH_SERVER ON CACHE BOOL "build with server") -set(WITH_SAMPLE ON CACHE BOOL "build with sample") -set(WITH_SANITIZE_ADDRESS ON) -set(WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") diff --git a/ci/cmake-preloads/config-windows.txt b/ci/cmake-preloads/config-windows.txt index 3ee05f10a..68387d254 100644 --- a/ci/cmake-preloads/config-windows.txt +++ b/ci/cmake-preloads/config-windows.txt @@ -1,4 +1,5 @@ message("PRELOADING windows cache") +set(CMAKE_C_STANDARD 23 CACHE STRING "preload") set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set(CMAKE_WINDOWS_VERSION "WIN7" CACHE STRING "windows build version") set(BUILD_SHARED_LIBS OFF CACHE BOOL "build static linked executable")