diff options
| -rw-r--r-- | .github/workflows/cmake.yml | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index d8dd659c46..340a97e952 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -66,7 +66,7 @@ jobs: run: | mkdir -p Build cd Build - cmake .. -GNinja -DBUILD_LAGOM=1 -DALL_THE_DEBUG_MACROS=1 + cmake .. -GNinja -DBUILD_LAGOM=1 -DENABLE_ALL_THE_DEBUG_MACROS=ON # === ACTUALLY BUILD AND TEST === @@ -173,7 +173,7 @@ jobs: run: | mkdir -p Build cd Build - cmake .. -GNinja -DBUILD_LAGOM=1 -DALL_THE_DEBUG_MACROS=1 -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 + cmake .. -GNinja -DBUILD_LAGOM=1 -DENABLE_ALL_THE_DEBUG_MACROS=ON -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 # === ACTUALLY BUILD AND TEST === diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e01cbeb27..883cd6087c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,10 +16,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(SERENITY_ARCH "i686" CACHE STRING "Target architecture for SerenityOS.") +# Central location for all custom options used in the Serenity build. option(ENABLE_ADDRESS_SANITIZER "Enable address sanitizer testing in gcc/clang" FALSE) option(ENABLE_MEMORY_SANITIZER "Enable memory sanitizer testing in gcc/clang" FALSE) option(ENABLE_UNDEFINED_SANITIZER "Enable undefined behavior sanitizer testing in gcc/clang" FALSE) option(ENABLE_FUZZER_SANITIZER "Enable fuzzer sanitizer testing in clang" FALSE) +option(ENABLE_ALL_THE_DEBUG_MACROS "Enable all debug macros to validate they still compile" FALSE) add_custom_target(run COMMAND ${CMAKE_SOURCE_DIR}/Meta/run.sh @@ -61,9 +63,9 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") add_compile_options(-Wno-overloaded-virtual) endif() -if (ALL_THE_DEBUG_MACROS) +if (ENABLE_ALL_THE_DEBUG_MACROS) include(${CMAKE_SOURCE_DIR}/Meta/CMake/all_the_debug_macros.cmake) -endif(ALL_THE_DEBUG_MACROS) +endif(ENABLE_ALL_THE_DEBUG_MACROS) include_directories(Libraries) include_directories(.) |