mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 20:07:34 +00:00
CMake+Userland: Use CMakeLists from Userland to build Lagom Libraries
Also do this for Shell. This greatly simplifies the CMakeLists in Lagom, replacing many glob patterns with a big list of libraries. There are still a few special libraries that need some help to conform to the pattern, like LibELF and LibWebView. It also lets us remove essentially all of the Serenity or Lagom binary directory detection logic from code generators, as now both projects directories enter the generator logic from the same place.
This commit is contained in:
parent
a01c0e81f3
commit
1ae0cfd08b
12 changed files with 217 additions and 461 deletions
|
@ -2,7 +2,11 @@ include(${SerenityOS_SOURCE_DIR}/Meta/CMake/locale_data.cmake)
|
|||
|
||||
if (DEFINED LOCALE_DATA_SOURCES)
|
||||
set(SOURCES ${LOCALE_DATA_SOURCES})
|
||||
serenity_lib(LibLocaleData localedata)
|
||||
if (SERENITYOS)
|
||||
serenity_lib(LibLocaleData localedata)
|
||||
else()
|
||||
add_library(LibLocaleData OBJECT ${SOURCES})
|
||||
endif()
|
||||
target_compile_options(LibLocaleData PRIVATE -g0 -Os -Wno-parentheses-equality)
|
||||
target_link_libraries(LibLocaleData LibCore LibTimeZone)
|
||||
endif()
|
||||
|
@ -20,5 +24,9 @@ target_link_libraries(LibLocale LibCore LibUnicode)
|
|||
target_compile_definitions(LibLocale PRIVATE ENABLE_UNICODE_DATA=$<BOOL:${ENABLE_UNICODE_DATABASE_DOWNLOAD}>)
|
||||
|
||||
if (DEFINED LOCALE_DATA_SOURCES)
|
||||
add_dependencies(LibLocale LibLocaleData)
|
||||
if (SERENITYOS)
|
||||
add_dependencies(LibLocale LibLocaleData)
|
||||
else()
|
||||
target_link_libraries(LibLocale LibLocaleData)
|
||||
endif()
|
||||
endif()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue