From 4aaefeb1d5b71405fbdd974c283e248c1a460a57 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Sat, 15 Apr 2023 17:34:18 -0400 Subject: [PATCH] Meta: Move some flags to common_compile_options.cmake No behavior change. --- Meta/CMake/common_compile_options.cmake | 7 +++++++ Meta/CMake/lagom_compile_options.cmake | 4 ---- Meta/CMake/serenity_compile_options.cmake | 4 ---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Meta/CMake/common_compile_options.cmake b/Meta/CMake/common_compile_options.cmake index 073daa0bcb9..2c0671881b4 100644 --- a/Meta/CMake/common_compile_options.cmake +++ b/Meta/CMake/common_compile_options.cmake @@ -1,3 +1,4 @@ +# Flags shared by Lagom (including Ladybird) and Serenity. set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) @@ -5,6 +6,12 @@ set(CMAKE_CXX_EXTENSIONS OFF) add_compile_options(-Wall) add_compile_options(-Wextra) +add_compile_options(-Wno-unknown-warning-option) +add_compile_options(-Wno-unused-command-line-argument) + +add_compile_options(-fdiagnostics-color=always) +add_compile_options(-fno-exceptions) + if (NOT CMAKE_HOST_SYSTEM_NAME MATCHES SerenityOS) # FIXME: Something makes this go crazy and flag unused variables that aren't flagged as such when building with the toolchain. # Disable -Werror for now. diff --git a/Meta/CMake/lagom_compile_options.cmake b/Meta/CMake/lagom_compile_options.cmake index de6b4176cd0..b784a8b94a5 100644 --- a/Meta/CMake/lagom_compile_options.cmake +++ b/Meta/CMake/lagom_compile_options.cmake @@ -4,11 +4,7 @@ add_compile_options(-Wno-implicit-const-int-float-conversion) add_compile_options(-Wno-literal-suffix) add_compile_options(-Wno-maybe-uninitialized) add_compile_options(-Wno-shorten-64-to-32) -add_compile_options(-Wno-unknown-warning-option) -add_compile_options(-Wno-unused-command-line-argument) add_compile_options(-fsigned-char) -add_compile_options(-fno-exceptions) -add_compile_options(-fdiagnostics-color=always) add_compile_options(-g1) add_compile_options(-O2) if (NOT ENABLE_FUZZERS AND NOT APPLE) diff --git a/Meta/CMake/serenity_compile_options.cmake b/Meta/CMake/serenity_compile_options.cmake index 849a11e8e5d..19f8b45dab6 100644 --- a/Meta/CMake/serenity_compile_options.cmake +++ b/Meta/CMake/serenity_compile_options.cmake @@ -12,16 +12,12 @@ add_compile_options(-Wmisleading-indentation) add_compile_options(-Wmissing-declarations) add_compile_options(-Wnon-virtual-dtor) add_compile_options(-Wsuggest-override) -add_compile_options(-Wno-unknown-warning-option) add_compile_options(-Wundef) add_compile_options(-Wunused) -add_compile_options(-Wno-unused-command-line-argument) add_compile_options(-Wwrite-strings) -add_compile_options(-fdiagnostics-color=always) add_compile_options(-fno-delete-null-pointer-checks) add_compile_options(-ffile-prefix-map=${SerenityOS_SOURCE_DIR}=.) -add_compile_options(-fno-exceptions) add_compile_options(-fno-semantic-interposition) add_compile_options(-fsized-deallocation) add_compile_options(-fstack-clash-protection)