beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

CMake: Pass NO_POLICY_SCOPE to options cmake helpers

Browse source 
Tell CMake to not create a new policy scope for the
(lagom|serenity|common)_options.cmake helpers, and lets us set common
policies for both projects in common_options.cmake that actually apply
to the rest of the project, instead of just common_options.cmake itself.
This commit is contained in:
Andrew Kaster 2022-12-13 18:57:01 -07:00 committed by Andreas Kling
parent f96a3c002a
commit 16d4791212
Notes: sideshowbarker 2024-07-17 03:16:02 +09:00 
Author: https://github.com/ADKaster
Commit: https://github.com/SerenityOS/serenity/commit/16d4791212
Pull-request: https://github.com/SerenityOS/serenity/pull/16486
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -39,7 +39,7 @@ if(NOT COMMAND serenity_option)
set(${ARGV}) set(${ARGV})
endmacro() endmacro()
endif() endif()
include(serenity_options) include(serenity_options NO_POLICY_SCOPE)
include(setup_ccache) include(setup_ccache)

2
Meta/CMake/lagom_options.cmake
View file

@ -2,7 +2,7 @@
# Options specific to the Lagom (host) build # Options specific to the Lagom (host) build
# #
include(${CMAKE_CURRENT_LIST_DIR}/common_options.cmake) include(${CMAKE_CURRENT_LIST_DIR}/common_options.cmake NO_POLICY_SCOPE)
serenity_option(ENABLE_ADDRESS_SANITIZER OFF CACHE BOOL "Enable address sanitizer testing in gcc/clang") serenity_option(ENABLE_ADDRESS_SANITIZER OFF CACHE BOOL "Enable address sanitizer testing in gcc/clang")
serenity_option(ENABLE_MEMORY_SANITIZER OFF CACHE BOOL "Enable memory sanitizer testing in gcc/clang") serenity_option(ENABLE_MEMORY_SANITIZER OFF CACHE BOOL "Enable memory sanitizer testing in gcc/clang")

2
Meta/CMake/serenity_options.cmake
View file

@ -2,7 +2,7 @@
# Options specific to the Serenity (target) build # Options specific to the Serenity (target) build
# #
include(${CMAKE_CURRENT_LIST_DIR}/common_options.cmake) include(${CMAKE_CURRENT_LIST_DIR}/common_options.cmake NO_POLICY_SCOPE)
serenity_option(ENABLE_PCI_IDS_DOWNLOAD ON CACHE BOOL "Enable download of the pci.ids database at build time") serenity_option(ENABLE_PCI_IDS_DOWNLOAD ON CACHE BOOL "Enable download of the pci.ids database at build time")
serenity_option(ENABLE_USB_IDS_DOWNLOAD ON CACHE BOOL "Enable download of the usb.ids database at build time") serenity_option(ENABLE_USB_IDS_DOWNLOAD ON CACHE BOOL "Enable download of the usb.ids database at build time")

2
Meta/Lagom/CMakeLists.txt
View file

@ -34,7 +34,7 @@ if(NOT COMMAND serenity_option)
endif() endif()
include(check_for_dependencies) include(check_for_dependencies)
include(lagom_options) include(lagom_options NO_POLICY_SCOPE)
if(ENABLE_ALL_THE_DEBUG_MACROS) if(ENABLE_ALL_THE_DEBUG_MACROS)
include(all_the_debug_macros) include(all_the_debug_macros)