From d6273674896445504ba6dc61a53cc5c0e23071b8 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 10 Jan 2022 17:04:26 -0500 Subject: [PATCH] LibTimeZone: Do not separate the generated data from the main library This CMakeLists.txt was basically copy-pasted from LibUnicode, where the generated data is separated into its own library. This was to let other libraries / applications decide if they actually want to link the data because it is so large. LibTimeZone's generated data is significantly smaller, so this separation really isn't needed. --- Userland/Libraries/LibTimeZone/CMakeLists.txt | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Userland/Libraries/LibTimeZone/CMakeLists.txt b/Userland/Libraries/LibTimeZone/CMakeLists.txt index 834a19747f..218f0217f1 100644 --- a/Userland/Libraries/LibTimeZone/CMakeLists.txt +++ b/Userland/Libraries/LibTimeZone/CMakeLists.txt @@ -1,20 +1,10 @@ include(${SerenityOS_SOURCE_DIR}/Meta/CMake/time_zone_data.cmake) -if (DEFINED TIME_ZONE_DATA_SOURCES) - set(SOURCES ${TIME_ZONE_DATA_SOURCES}) - serenity_lib(LibTimeZoneData timezonedata) - target_compile_options(LibTimeZoneData PRIVATE -g0 -Os) - target_link_libraries(LibTimeZoneData LibCore) -endif() - set(SOURCES TimeZone.cpp + ${TIME_ZONE_DATA_SOURCES} ) serenity_lib(LibTimeZone timezone) target_link_libraries(LibTimeZone LibCore) target_compile_definitions(LibTimeZone PRIVATE ENABLE_TIME_ZONE_DATA=$) - -if (DEFINED TIME_ZONE_DATA_SOURCES) - target_link_libraries(LibTimeZone LibTimeZoneData) -endif()