浏览代码

Meta: Move some flags to common_compile_options.cmake

No behavior change.
Nico Weber 2 年之前
父节点
当前提交
4aaefeb1d5

+ 7 - 0
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.

+ 0 - 4
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)

+ 0 - 4
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)