diff options
| author | Andrew Kaster <akaster@serenityos.org> | 2023-02-02 03:22:20 -0700 |
|---|---|---|
| committer | Andrew Kaster <andrewdkaster@gmail.com> | 2023-02-02 05:35:44 -0700 |
| commit | 0d5d3f12e22f59a8104bae5b5a3e13224e939049 (patch) | |
| tree | de936369a91c9c1185e8b068b7b9cbad6f57e130 | |
| parent | 8f70e365f0a4d8b90c1b6b83af060846221f3c93 (diff) | |
| download | serenity-0d5d3f12e22f59a8104bae5b5a3e13224e939049.zip | |
Ladybird: Clean up install rules for executables
Use a list of executables to make sure that we don't miss any of the
applications used by Ladybird and its friends like WebDriver, and make
sure to install include all executables and their runtime dependencies.
| -rw-r--r-- | Ladybird/cmake/InstallRules.cmake | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/Ladybird/cmake/InstallRules.cmake b/Ladybird/cmake/InstallRules.cmake index f06af374ac..5bfbdafb11 100644 --- a/Ladybird/cmake/InstallRules.cmake +++ b/Ladybird/cmake/InstallRules.cmake @@ -4,7 +4,9 @@ include(GNUInstallDirs) set(package ladybird) -install(TARGETS ladybird +set(ladybird_applications ladybird SQLServer WebContent WebDriver headless-browser) + +install(TARGETS ${ladybird_applications} EXPORT ladybirdTargets RUNTIME COMPONENT ladybird_Runtime @@ -18,31 +20,11 @@ install(TARGETS ladybird DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -install(TARGETS SQLServer - EXPORT ladybirdTargets - RUNTIME - COMPONENT ladybird_Runtime - DESTINATION ${CMAKE_INSTALL_BINDIR} - BUNDLE - COMPONENT ladybird_Runtime - DESTINATION bundle -) - -install(TARGETS WebContent - EXPORT ladybirdTargets - RUNTIME - COMPONENT ladybird_Runtime - DESTINATION ${CMAKE_INSTALL_BINDIR} - BUNDLE - COMPONENT ladybird_Runtime - DESTINATION bundle -) - include("${SERENITY_SOURCE_DIR}/Meta/Lagom/get_linked_lagom_libraries.cmake") -get_linked_lagom_libraries(ladybird ladybird_lagom_libraries) -get_linked_lagom_libraries(SQLServer sqlserver_lagom_libraries) -get_linked_lagom_libraries(WebContent webcontent_lagom_libraries) -list(APPEND all_required_lagom_libraries ${ladybird_lagom_libraries} ${sqlserver_lagom_libraries} ${webcontent_lagom_libraries}) +foreach (application IN LISTS ladybird_applications) + get_linked_lagom_libraries("${application}" "${application}_lagom_libraries") + list(APPEND all_required_lagom_libraries "${${application}_lagom_libraries}") +endforeach() list(REMOVE_DUPLICATES all_required_lagom_libraries) install(TARGETS ${all_required_lagom_libraries} |