mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-29 12:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Meta: Guard everything that installs headers with an option

Browse source
This commit is contained in:
Tim Schumacher 2024-07-20 19:03:24 +02:00 • committed by Andrew Kaster
commit cf6929fef3
Notes: github-actions[bot] 2024-07-25 19:26:05 +00:00
8 changed files with 83 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ladybird/CMakeLists.txt
View file

@ -78,10 +78,12 @@ if (APPLE)
target_link_libraries(ladybird PRIVATE LibThreading) target_link_libraries(ladybird PRIVATE LibThreading)
endif() endif()
target_sources(ladybird PUBLIC FILE_SET ladybird TYPE HEADERS if (ENABLE_INSTALL_HEADERS)
BASE_DIRS ${LADYBIRD_SOURCE_DIR} target_sources(ladybird PUBLIC FILE_SET ladybird TYPE HEADERS
FILES ${LADYBIRD_HEADERS} BASE_DIRS ${LADYBIRD_SOURCE_DIR}
) FILES ${LADYBIRD_HEADERS}
)
endif()
if (TARGET ladybird_impl) if (TARGET ladybird_impl)
set(LADYBIRD_TARGET ladybird_impl PUBLIC) set(LADYBIRD_TARGET ladybird_impl PUBLIC)

4
Meta/CMake/code_generators.cmake
View file

@ -41,6 +41,8 @@ function(compile_ipc source output)
add_dependencies(all_generated generate_${output_name}) add_dependencies(all_generated generate_${output_name})
cmake_path(RELATIVE_PATH CMAKE_CURRENT_SOURCE_DIR BASE_DIRECTORY ${SerenityOS_SOURCE_DIR} OUTPUT_VARIABLE current_source_dir_relative) cmake_path(RELATIVE_PATH CMAKE_CURRENT_SOURCE_DIR BASE_DIRECTORY ${SerenityOS_SOURCE_DIR} OUTPUT_VARIABLE current_source_dir_relative)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${output} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${current_source_dir_relative}" OPTIONAL) if (ENABLE_INSTALL_HEADERS)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${output} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${current_source_dir_relative}" OPTIONAL)
endif()
endfunction() endfunction()

2
Meta/CMake/common_options.cmake
View file

@ -35,3 +35,5 @@ serenity_option(ENABLE_CLANG_PLUGINS_INVALID_FUNCTION_MEMBERS OFF CACHE BOOL "En
serenity_option(ENABLE_GUI_TARGETS ON CACHE BOOL "Enable building GUI targets") serenity_option(ENABLE_GUI_TARGETS ON CACHE BOOL "Enable building GUI targets")
serenity_option(ENABLE_SWIFT OFF CACHE BOOL "Enable building Swift files") serenity_option(ENABLE_SWIFT OFF CACHE BOOL "Enable building Swift files")
serenity_option(ENABLE_INSTALL_HEADERS ON CACHE BOOL "Enable installing headers")

4
Meta/CMake/libtextcodec_generators.cmake
View file

@ -11,5 +11,7 @@ function (generate_encoding_indexes)
arguments -j "${LIBTEXTCODEC_INPUT_FOLDER}/indexes.json" arguments -j "${LIBTEXTCODEC_INPUT_FOLDER}/indexes.json"
) )
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/LookupTables.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibTextCodec/") if (ENABLE_INSTALL_HEADERS)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/LookupTables.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibTextCodec/")
endif()
endfunction() endfunction()

40
Meta/CMake/libweb_generators.cmake
View file

@ -96,17 +96,19 @@ function (generate_css_implementation)
NAMESPACE "Web::CSS" NAMESPACE "Web::CSS"
) )
set(CSS_GENERATED_TO_INSTALL if (ENABLE_INSTALL_HEADERS)
"CSS/Enums.h" set(CSS_GENERATED_TO_INSTALL
"CSS/MathFunctions.h" "CSS/Enums.h"
"CSS/MediaFeatureID.h" "CSS/MathFunctions.h"
"CSS/PropertyID.h" "CSS/MediaFeatureID.h"
"CSS/PseudoClass.h" "CSS/PropertyID.h"
"CSS/TransformFunctions.h" "CSS/PseudoClass.h"
"CSS/ValueID.h" "CSS/TransformFunctions.h"
) "CSS/ValueID.h"
list(TRANSFORM CSS_GENERATED_TO_INSTALL PREPEND "${CMAKE_CURRENT_BINARY_DIR}/") )
install(FILES ${CSS_GENERATED_TO_INSTALL} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibWeb/CSS") list(TRANSFORM CSS_GENERATED_TO_INSTALL PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
install(FILES ${CSS_GENERATED_TO_INSTALL} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibWeb/CSS")
endif()
endfunction() endfunction()
@ -173,9 +175,11 @@ function (generate_js_bindings target)
add_dependencies(all_generated generate_${basename}) add_dependencies(all_generated generate_${basename})
add_dependencies(${target} generate_${basename}) add_dependencies(${target} generate_${basename})
# install generated sources if (ENABLE_INSTALL_HEADERS)
list(FILTER BINDINGS_SOURCES INCLUDE REGEX "\.h$") # install generated sources
install(FILES ${BINDINGS_SOURCES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibWeb/Bindings") list(FILTER BINDINGS_SOURCES INCLUDE REGEX "\.h$")
install(FILES ${BINDINGS_SOURCES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibWeb/Bindings")
endif()
list(APPEND LIBWEB_ALL_IDL_FILES "${LIBWEB_INPUT_FOLDER}/${class}.idl") list(APPEND LIBWEB_ALL_IDL_FILES "${LIBWEB_INPUT_FOLDER}/${class}.idl")
set(LIBWEB_ALL_IDL_FILES ${LIBWEB_ALL_IDL_FILES} PARENT_SCOPE) set(LIBWEB_ALL_IDL_FILES ${LIBWEB_ALL_IDL_FILES} PARENT_SCOPE)
@ -208,9 +212,11 @@ function (generate_js_bindings target)
add_dependencies(all_generated generate_exposed_interfaces) add_dependencies(all_generated generate_exposed_interfaces)
add_dependencies(${target} generate_exposed_interfaces) add_dependencies(${target} generate_exposed_interfaces)
list(FILTER exposed_interface_sources INCLUDE REGEX "\.h$") if (ENABLE_INSTALL_HEADERS)
list(TRANSFORM exposed_interface_sources PREPEND "${CMAKE_CURRENT_BINARY_DIR}/") list(FILTER exposed_interface_sources INCLUDE REGEX "\.h$")
install(FILES ${exposed_interface_sources} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibWeb/Bindings") list(TRANSFORM exposed_interface_sources PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
install(FILES ${exposed_interface_sources} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibWeb/Bindings")
endif()
endfunction() endfunction()
include("idl_files.cmake") include("idl_files.cmake")

54
Meta/Lagom/CMakeLists.txt
View file

@ -228,19 +228,23 @@ function(lagom_lib target_name fs_name)
endif() endif()
# FIXME: Clean these up so that we don't need so many include dirs # FIXME: Clean these up so that we don't need so many include dirs
target_include_directories(${target_name} INTERFACE if (ENABLE_INSTALL_HEADERS)
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Services> target_include_directories(${target_name} INTERFACE
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Userland/Libraries> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Services>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Userland/Services> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Userland/Libraries>
) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Userland/Services>
)
endif()
add_lagom_library_install_rules(${target_name} ALIAS_NAME ${library}) add_lagom_library_install_rules(${target_name} ALIAS_NAME ${library})
# FIXME: Move this to serenity_install_headers if (ENABLE_INSTALL_HEADERS)
install( # FIXME: Move this to serenity_install_headers
DIRECTORY "${SERENITY_PROJECT_ROOT}/Userland/Libraries/Lib${library}" install(
COMPONENT Lagom_Development DIRECTORY "${SERENITY_PROJECT_ROOT}/Userland/Libraries/Lib${library}"
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT Lagom_Development
FILES_MATCHING PATTERN "*.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
) FILES_MATCHING PATTERN "*.h"
)
endif()
serenity_generated_sources(${target_name}) serenity_generated_sources(${target_name})
endfunction() endfunction()
@ -347,18 +351,20 @@ add_serenity_subdirectory(Userland/Libraries/LibFileSystem)
add_serenity_subdirectory(Userland/Libraries/LibIDL) add_serenity_subdirectory(Userland/Libraries/LibIDL)
# Manually install AK headers # Manually install AK headers
install( if (ENABLE_INSTALL_HEADERS)
DIRECTORY "${SERENITY_PROJECT_ROOT}/AK" install(
COMPONENT Lagom_Development DIRECTORY "${SERENITY_PROJECT_ROOT}/AK"
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT Lagom_Development
FILES_MATCHING PATTERN "*.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
) FILES_MATCHING PATTERN "*.h"
install(FILES )
${Lagom_BINARY_DIR}/AK/Debug.h install(FILES
${Lagom_BINARY_DIR}/AK/Backtrace.h ${Lagom_BINARY_DIR}/AK/Debug.h
COMPONENT Lagom_Development ${Lagom_BINARY_DIR}/AK/Backtrace.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/AK" COMPONENT Lagom_Development
) DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/AK"
)
endif()
# Code Generators and other host tools # Code Generators and other host tools
if (BUILD_LAGOM_TOOLS) if (BUILD_LAGOM_TOOLS)

6
Userland/Libraries/LibGfx/CMakeLists.txt
View file

@ -83,8 +83,10 @@ add_custom_target(generate_tiff_files_handler DEPENDS ${generated_sources})
add_dependencies(all_generated generate_tiff_files_handler) add_dependencies(all_generated generate_tiff_files_handler)
add_dependencies(LibGfx generate_tiff_files_handler) add_dependencies(LibGfx generate_tiff_files_handler)
list(TRANSFORM generated_sources PREPEND "${CMAKE_CURRENT_BINARY_DIR}/") if (ENABLE_INSTALL_HEADERS)
install(FILES ${generated_sources} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibGfx/ImageFormats") list(TRANSFORM generated_sources PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
install(FILES ${generated_sources} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibGfx/ImageFormats")
endif()
# Third-party # Third-party
find_package(PkgConfig) find_package(PkgConfig)

22
Userland/Libraries/LibWebView/CMakeLists.txt
View file

@ -55,16 +55,18 @@ target_compile_definitions(LibWebView PRIVATE ENABLE_PUBLIC_SUFFIX=$<BOOL:${ENAB
find_package(SQLite3 REQUIRED) find_package(SQLite3 REQUIRED)
target_link_libraries(LibWebView PRIVATE SQLite::SQLite3) target_link_libraries(LibWebView PRIVATE SQLite::SQLite3)
foreach(header ${GENERATED_SOURCES}) if (ENABLE_INSTALL_HEADERS)
get_filename_component(extension ${header} EXT) foreach(header ${GENERATED_SOURCES})
if (NOT "${extension}" STREQUAL ".h") get_filename_component(extension ${header} EXT)
continue() if (NOT "${extension}" STREQUAL ".h")
endif() continue()
endif()
get_filename_component(subdirectory ${header} DIRECTORY) get_filename_component(subdirectory ${header} DIRECTORY)
string(REGEX REPLACE "^\\.\\./\\.\\./" "" subdirectory "${subdirectory}") string(REGEX REPLACE "^\\.\\./\\.\\./" "" subdirectory "${subdirectory}")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${header}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${subdirectory}") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${header}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${subdirectory}")
endforeach() endforeach()
install(FILES "${SERENITY_PROJECT_ROOT}/Userland/Services/RequestServer/ConnectionCache.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RequestServer") install(FILES "${SERENITY_PROJECT_ROOT}/Userland/Services/RequestServer/ConnectionCache.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RequestServer")
endif()