From 166a905951023a4c183a196ef444e689fdfa9697 Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Wed, 12 Oct 2022 15:46:13 +0330 Subject: [PATCH] Userland: Properly populate GENERATED_SOURCES We previously put the generated headers in SOURCES, which did not mark them as GENERATED (and did not produce a proper dependency). This commit moves all generated headers into GENERATED_SOURCES, and removes useless header SOURCES. --- Userland/Applications/Browser/CMakeLists.txt | 11 ++++++---- .../BrowserSettings/CMakeLists.txt | 9 ++++++--- .../Applications/Calculator/CMakeLists.txt | 3 +++ Userland/Applications/Calendar/CMakeLists.txt | 5 ++++- .../CalendarSettings/CMakeLists.txt | 4 +++- .../Applications/CharacterMap/CMakeLists.txt | 7 +++++-- .../Applications/ClockSettings/CMakeLists.txt | 7 ++++--- .../Applications/CrashReporter/CMakeLists.txt | 3 +++ .../DisplaySettings/CMakeLists.txt | 17 ++++++++-------- .../Applications/FileManager/CMakeLists.txt | 9 ++++++--- .../Applications/FontEditor/CMakeLists.txt | 8 +++++--- .../Applications/GamesSettings/CMakeLists.txt | 12 ++++++----- Userland/Applications/Help/CMakeLists.txt | 5 ++++- .../Applications/HexEditor/CMakeLists.txt | 9 ++++++--- .../KeyboardSettings/CMakeLists.txt | 5 ++++- .../Applications/Magnifier/CMakeLists.txt | 1 - Userland/Applications/Mail/CMakeLists.txt | 7 +++++-- .../Applications/MailSettings/CMakeLists.txt | 4 +++- .../Applications/MouseSettings/CMakeLists.txt | 11 +++++----- .../NetworkSettings/CMakeLists.txt | 8 +++++--- .../PartitionEditor/CMakeLists.txt | 5 ++++- .../Applications/PixelPaint/CMakeLists.txt | 17 +++++++++------- Userland/Applications/Run/CMakeLists.txt | 4 +++- .../Applications/SpaceAnalyzer/CMakeLists.txt | 5 ++++- .../Applications/Spreadsheet/CMakeLists.txt | 4 ++-- .../Applications/SystemMonitor/CMakeLists.txt | 3 +++ .../TerminalSettings/CMakeLists.txt | 5 ++++- .../Applications/TextEditor/CMakeLists.txt | 5 ++++- .../Applications/ThemeEditor/CMakeLists.txt | 5 ++++- Userland/Applications/Welcome/CMakeLists.txt | 6 ++++-- Userland/Demos/ModelGallery/CMakeLists.txt | 3 +++ Userland/Demos/WidgetGallery/CMakeLists.txt | 5 ++++- Userland/DevTools/HackStudio/CMakeLists.txt | 9 ++++++--- Userland/Games/GameOfLife/CMakeLists.txt | 5 ++++- Userland/Games/Hearts/CMakeLists.txt | 3 +++ Userland/Games/Minesweeper/CMakeLists.txt | 7 +++++-- Userland/Games/Solitaire/CMakeLists.txt | 3 +++ Userland/Games/Spider/CMakeLists.txt | 3 +++ Userland/Libraries/LibGUI/CMakeLists.txt | 20 +++++++++---------- Userland/Services/AudioServer/CMakeLists.txt | 3 +++ Userland/Services/Clipboard/CMakeLists.txt | 7 +++++-- Userland/Services/ConfigServer/CMakeLists.txt | 3 +++ .../FileSystemAccessServer/CMakeLists.txt | 3 +++ Userland/Services/ImageDecoder/CMakeLists.txt | 3 +++ .../Services/InspectorServer/CMakeLists.txt | 3 +++ Userland/Services/LaunchServer/CMakeLists.txt | 3 +++ Userland/Services/LoginServer/CMakeLists.txt | 5 ++++- Userland/Services/LookupServer/CMakeLists.txt | 7 +++++-- .../NotificationServer/CMakeLists.txt | 3 +++ .../Services/RequestServer/CMakeLists.txt | 7 +++++-- Userland/Services/SQLServer/CMakeLists.txt | 7 +++++-- Userland/Services/WebContent/CMakeLists.txt | 7 +++++-- Userland/Services/WebSocket/CMakeLists.txt | 3 +++ Userland/Services/WindowServer/CMakeLists.txt | 7 +++++-- 54 files changed, 236 insertions(+), 97 deletions(-) diff --git a/Userland/Applications/Browser/CMakeLists.txt b/Userland/Applications/Browser/CMakeLists.txt index c6fe8b8e010..e5956a02e98 100644 --- a/Userland/Applications/Browser/CMakeLists.txt +++ b/Userland/Applications/Browser/CMakeLists.txt @@ -13,25 +13,28 @@ compile_gml(Tab.gml TabGML.h tab_gml) set(SOURCES BookmarksBarWidget.cpp BrowserWindow.cpp - BrowserWindowGML.h ConsoleWidget.cpp CookieJar.cpp CookiesModel.cpp DownloadWidget.cpp - EditBookmarkGML.h ElementSizePreviewWidget.cpp History.cpp IconBag.cpp InspectorWidget.cpp StorageModel.cpp StorageWidget.cpp - StorageWidgetGML.h Tab.cpp - TabGML.h WindowActions.cpp main.cpp ) +set(GENERATED_SOURCES + BrowserWindowGML.h + EditBookmarkGML.h + StorageWidgetGML.h + TabGML.h +) + serenity_app(Browser ICON app-browser) target_link_libraries(Browser LibWebView LibWeb LibProtocol LibGUI LibDesktop LibConfig LibMain) link_with_locale_data(Browser) diff --git a/Userland/Applications/BrowserSettings/CMakeLists.txt b/Userland/Applications/BrowserSettings/CMakeLists.txt index b49cc5687ec..d7c1a689135 100644 --- a/Userland/Applications/BrowserSettings/CMakeLists.txt +++ b/Userland/Applications/BrowserSettings/CMakeLists.txt @@ -8,11 +8,14 @@ compile_gml(BrowserSettingsWidget.gml BrowserSettingsWidgetGML.h browser_setting compile_gml(ContentFilterSettingsWidget.gml ContentFilterSettingsWidgetGML.h content_filter_settings_widget_gml) set(SOURCES - main.cpp - ContentFilterSettingsWidget.cpp - ContentFilterSettingsWidgetGML.h BrowserSettingsWidget.cpp + ContentFilterSettingsWidget.cpp + main.cpp +) + +set(GENERATED_SOURCES BrowserSettingsWidgetGML.h + ContentFilterSettingsWidgetGML.h ) serenity_app(BrowserSettings ICON app-browser) diff --git a/Userland/Applications/Calculator/CMakeLists.txt b/Userland/Applications/Calculator/CMakeLists.txt index 476ba67bb16..f4aa296cc3e 100644 --- a/Userland/Applications/Calculator/CMakeLists.txt +++ b/Userland/Applications/Calculator/CMakeLists.txt @@ -11,6 +11,9 @@ set(SOURCES CalculatorWidget.cpp RoundingDialog.cpp Keypad.cpp +) + +set(GENERATED_SOURCES CalculatorGML.h ) diff --git a/Userland/Applications/Calendar/CMakeLists.txt b/Userland/Applications/Calendar/CMakeLists.txt index 48db85ebbc1..ebe137613ea 100644 --- a/Userland/Applications/Calendar/CMakeLists.txt +++ b/Userland/Applications/Calendar/CMakeLists.txt @@ -7,9 +7,12 @@ compile_gml(CalendarWindow.gml CalendarWindowGML.h calendar_window_gml) set(SOURCES AddEventDialog.cpp - CalendarWindowGML.h main.cpp ) +set(GENERATED_SOURCES + CalendarWindowGML.h +) + serenity_app(Calendar ICON app-calendar) target_link_libraries(Calendar LibGUI LibMain) diff --git a/Userland/Applications/CalendarSettings/CMakeLists.txt b/Userland/Applications/CalendarSettings/CMakeLists.txt index 986dfef1736..3ebafefc9c4 100644 --- a/Userland/Applications/CalendarSettings/CMakeLists.txt +++ b/Userland/Applications/CalendarSettings/CMakeLists.txt @@ -9,7 +9,9 @@ compile_gml(CalendarSettingsWidget.gml CalendarSettingsWidgetGML.h calendar_sett set(SOURCES main.cpp CalendarSettingsWidget.cpp - CalendarSettingsWidget.h +) + +set(GENERATED_SOURCES CalendarSettingsWidgetGML.h ) diff --git a/Userland/Applications/CharacterMap/CMakeLists.txt b/Userland/Applications/CharacterMap/CMakeLists.txt index 4e7130890d8..6308f3a7027 100644 --- a/Userland/Applications/CharacterMap/CMakeLists.txt +++ b/Userland/Applications/CharacterMap/CMakeLists.txt @@ -9,11 +9,14 @@ compile_gml(CharacterSearchWindow.gml CharacterSearchWindowGML.h character_searc set(SOURCES CharacterMapWidget.cpp - CharacterMapWindowGML.h CharacterSearchWidget.cpp - CharacterSearchWindowGML.h main.cpp ) +set(GENERATED_SOURCES + CharacterMapWindowGML.h + CharacterSearchWindowGML.h +) + serenity_app(CharacterMap ICON app-character-map) target_link_libraries(CharacterMap LibDesktop LibGUI LibMain LibUnicode) diff --git a/Userland/Applications/ClockSettings/CMakeLists.txt b/Userland/Applications/ClockSettings/CMakeLists.txt index 8b32166c8d6..34361fc61ba 100644 --- a/Userland/Applications/ClockSettings/CMakeLists.txt +++ b/Userland/Applications/ClockSettings/CMakeLists.txt @@ -10,10 +10,11 @@ compile_gml(TimeZoneSettingsWidget.gml TimeZoneSettingsWidgetGML.h time_zone_set set(SOURCES main.cpp ClockSettingsWidget.cpp - ClockSettingsWidget.h - ClockSettingsWidgetGML.h TimeZoneSettingsWidget.cpp - TimeZoneSettingsWidget.h +) + +set(GENERATED_SOURCES + ClockSettingsWidgetGML.h TimeZoneSettingsWidgetGML.h ) diff --git a/Userland/Applications/CrashReporter/CMakeLists.txt b/Userland/Applications/CrashReporter/CMakeLists.txt index ead6e9c9622..5db1b7ba6c2 100644 --- a/Userland/Applications/CrashReporter/CMakeLists.txt +++ b/Userland/Applications/CrashReporter/CMakeLists.txt @@ -9,6 +9,9 @@ compile_gml(CrashReporterWindow.gml CrashReporterWindowGML.h crash_reporter_wind set(SOURCES main.cpp +) + +set(GENERATED_SOURCES CrashReporterWindowGML.h ) diff --git a/Userland/Applications/DisplaySettings/CMakeLists.txt b/Userland/Applications/DisplaySettings/CMakeLists.txt index 2b11d5f8b70..ae9165e0212 100644 --- a/Userland/Applications/DisplaySettings/CMakeLists.txt +++ b/Userland/Applications/DisplaySettings/CMakeLists.txt @@ -12,24 +12,25 @@ compile_gml(MonitorSettings.gml MonitorSettingsGML.h monitor_settings_window_gml compile_gml(ThemesSettings.gml ThemesSettingsGML.h themes_settings_gml) set(SOURCES - BackgroundSettingsGML.h BackgroundSettingsWidget.cpp DesktopSettingsWidget.cpp - DesktopSettingsGML.h - EffectsSettingsGML.h EffectsSettingsWidget.cpp - FontSettingsGML.h FontSettingsWidget.cpp MonitorSettingsWidget.cpp - MonitorSettingsGML.h MonitorWidget.cpp - ThemePreviewWidget.h ThemePreviewWidget.cpp - ThemesSettingsWidget.h ThemesSettingsWidget.cpp - ThemesSettingsGML.h main.cpp ) +set(GENERATED_SOURCES + BackgroundSettingsGML.h + DesktopSettingsGML.h + EffectsSettingsGML.h + FontSettingsGML.h + MonitorSettingsGML.h + ThemesSettingsGML.h +) + serenity_app(DisplaySettings ICON app-display-settings) target_link_libraries(DisplaySettings LibDesktop LibGUI LibConfig LibMain LibEDID) diff --git a/Userland/Applications/FileManager/CMakeLists.txt b/Userland/Applications/FileManager/CMakeLists.txt index ff3d7e8f3cf..2930bc140ff 100644 --- a/Userland/Applications/FileManager/CMakeLists.txt +++ b/Userland/Applications/FileManager/CMakeLists.txt @@ -12,13 +12,16 @@ compile_gml(PropertiesWindowGeneralTab.gml PropertiesWindowGeneralTabGML.h prope set(SOURCES DesktopWidget.cpp DirectoryView.cpp - FileManagerWindowGML.h - FileOperationProgress.gml FileOperationProgressWidget.cpp FileUtils.cpp main.cpp PropertiesWindow.cpp - PropertiesWindowGeneralTab.gml +) + +set(GENERATED_SOURCES + FileManagerWindowGML.h + FileOperationProgressGML.h + PropertiesWindowGeneralTabGML.h ) serenity_app(FileManager ICON app-file-manager) diff --git a/Userland/Applications/FontEditor/CMakeLists.txt b/Userland/Applications/FontEditor/CMakeLists.txt index 46ba969c6d8..0765129efda 100644 --- a/Userland/Applications/FontEditor/CMakeLists.txt +++ b/Userland/Applications/FontEditor/CMakeLists.txt @@ -12,14 +12,16 @@ compile_gml(NewFontDialogPage2.gml NewFontDialogPage2GML.h new_font_dialog_page_ set(SOURCES MainWidget.cpp - FontEditorWindowGML.h - FontPreviewWindowGML.h GlyphEditorWidget.cpp main.cpp NewFontDialog.cpp +) + +set(GENERATED_SOURCES + FontEditorWindowGML.h + FontPreviewWindowGML.h NewFontDialogPage1GML.h NewFontDialogPage2GML.h - UndoSelection.h ) serenity_app(FontEditor ICON app-font-editor) diff --git a/Userland/Applications/GamesSettings/CMakeLists.txt b/Userland/Applications/GamesSettings/CMakeLists.txt index 7e5d41706cd..5ae7e10bfb7 100644 --- a/Userland/Applications/GamesSettings/CMakeLists.txt +++ b/Userland/Applications/GamesSettings/CMakeLists.txt @@ -7,11 +7,13 @@ serenity_component( compile_gml(CardSettingsWidget.gml CardSettingsWidgetGML.h card_settings_widget_gml) set(SOURCES - main.cpp - CardSettingsWidgetGML.h - CardSettingsWidget.cpp - CardSettingsWidget.h - ) + main.cpp + CardSettingsWidget.cpp +) + +set(GENERATED_SOURCES + CardSettingsWidgetGML.h +) serenity_app(GamesSettings ICON games) target_link_libraries(GamesSettings LibGUI LibMain LibCards) diff --git a/Userland/Applications/Help/CMakeLists.txt b/Userland/Applications/Help/CMakeLists.txt index 90c2d412278..313f3043e57 100644 --- a/Userland/Applications/Help/CMakeLists.txt +++ b/Userland/Applications/Help/CMakeLists.txt @@ -8,7 +8,6 @@ serenity_component( compile_gml(HelpWindow.gml HelpWindowGML.h help_window_gml) set(SOURCES - HelpWindowGML.h History.cpp main.cpp MainWidget.cpp @@ -17,5 +16,9 @@ set(SOURCES ManualSectionNode.cpp ) +set(GENERATED_SOURCES + HelpWindowGML.h +) + serenity_app(Help ICON app-help) target_link_libraries(Help LibWebView LibWeb LibMarkdown LibGUI LibDesktop LibMain) diff --git a/Userland/Applications/HexEditor/CMakeLists.txt b/Userland/Applications/HexEditor/CMakeLists.txt index 014d249fec9..78b5b39ace9 100644 --- a/Userland/Applications/HexEditor/CMakeLists.txt +++ b/Userland/Applications/HexEditor/CMakeLists.txt @@ -9,12 +9,15 @@ compile_gml(GoToOffsetDialog.gml GoToOffsetDialogGML.h go_to_offset_dialog_gml) compile_gml(FindDialog.gml FindDialogGML.h find_dialog_gml) set(SOURCES - HexEditor.cpp - HexEditorWidget.cpp - HexDocument.cpp FindDialog.cpp GoToOffsetDialog.cpp + HexDocument.cpp + HexEditor.cpp + HexEditorWidget.cpp main.cpp +) + +set(GENERATED_SOURCES FindDialogGML.h GoToOffsetDialogGML.h HexEditorWindowGML.h diff --git a/Userland/Applications/KeyboardSettings/CMakeLists.txt b/Userland/Applications/KeyboardSettings/CMakeLists.txt index 83bed80c330..aa9ead38962 100644 --- a/Userland/Applications/KeyboardSettings/CMakeLists.txt +++ b/Userland/Applications/KeyboardSettings/CMakeLists.txt @@ -8,8 +8,11 @@ compile_gml(Keyboard.gml KeyboardWidgetGML.h keyboard_widget_gml) compile_gml(KeymapDialog.gml KeymapDialogGML.h keymap_dialog_gml) set(SOURCES - main.cpp KeyboardSettingsWidget.cpp + main.cpp +) + +set(GENERATED_SOURCES KeyboardWidgetGML.h KeymapDialogGML.h ) diff --git a/Userland/Applications/Magnifier/CMakeLists.txt b/Userland/Applications/Magnifier/CMakeLists.txt index caf2a97e950..529010bd316 100644 --- a/Userland/Applications/Magnifier/CMakeLists.txt +++ b/Userland/Applications/Magnifier/CMakeLists.txt @@ -6,7 +6,6 @@ serenity_component( set(SOURCES MagnifierWidget.cpp - MagnifierWidget.h main.cpp ) diff --git a/Userland/Applications/Mail/CMakeLists.txt b/Userland/Applications/Mail/CMakeLists.txt index 91e0ab96c13..a685f54cf77 100644 --- a/Userland/Applications/Mail/CMakeLists.txt +++ b/Userland/Applications/Mail/CMakeLists.txt @@ -10,11 +10,14 @@ compile_gml(MailWindow.gml MailWindowGML.h mail_window_gml) set(SOURCES AccountHolder.cpp InboxModel.cpp - MailboxTreeModel.cpp MailWidget.cpp - MailWindowGML.h + MailboxTreeModel.cpp main.cpp ) +set(GENERATED_SOURCES + MailWindowGML.h +) + serenity_app(Mail ICON app-mail) target_link_libraries(Mail LibConfig LibCore LibDesktop LibGfx LibGUI LibIMAP LibWebView LibWeb LibMain) diff --git a/Userland/Applications/MailSettings/CMakeLists.txt b/Userland/Applications/MailSettings/CMakeLists.txt index f007420cd9a..9bdf2bfe07b 100644 --- a/Userland/Applications/MailSettings/CMakeLists.txt +++ b/Userland/Applications/MailSettings/CMakeLists.txt @@ -9,7 +9,9 @@ compile_gml(MailSettingsWidget.gml MailSettingsWidgetGML.h mail_settings_widget_ set(SOURCES main.cpp MailSettingsWidget.cpp - MailSettingsWidget.h +) + +set(GENERATED_SOURCES MailSettingsWidgetGML.h ) diff --git a/Userland/Applications/MouseSettings/CMakeLists.txt b/Userland/Applications/MouseSettings/CMakeLists.txt index 402121ff834..444adb145d9 100644 --- a/Userland/Applications/MouseSettings/CMakeLists.txt +++ b/Userland/Applications/MouseSettings/CMakeLists.txt @@ -9,16 +9,17 @@ compile_gml(Theme.gml ThemeWidgetGML.h theme_widget_gml) compile_gml(Highlight.gml HighlightWidgetGML.h highlight_widget_gml) set(SOURCES - main.cpp DoubleClickArrowWidget.cpp HighlightPreviewWidget.cpp HighlightWidget.cpp - HighlightWidgetGML.h MouseWidget.cpp - MouseWidget.h - MouseWidgetGML.h ThemeWidget.cpp - ThemeWidget.h + main.cpp +) + +set(GENERATED_SOURCES + HighlightWidgetGML.h + MouseWidgetGML.h ThemeWidgetGML.h ) diff --git a/Userland/Applications/NetworkSettings/CMakeLists.txt b/Userland/Applications/NetworkSettings/CMakeLists.txt index 35fe06d0e8f..4e3ed31cfc5 100644 --- a/Userland/Applications/NetworkSettings/CMakeLists.txt +++ b/Userland/Applications/NetworkSettings/CMakeLists.txt @@ -7,10 +7,12 @@ serenity_component( compile_gml(NetworkSettings.gml NetworkSettingsGML.h network_settings_gml) set(SOURCES - main.cpp - NetworkSettingsGML.h NetworkSettingsWidget.cpp - NetworkSettingsWidget.h + main.cpp +) + +set(GENERATED_SOURCES + NetworkSettingsGML.h ) serenity_app(NetworkSettings ICON network) diff --git a/Userland/Applications/PartitionEditor/CMakeLists.txt b/Userland/Applications/PartitionEditor/CMakeLists.txt index 42d932d6709..33077267d50 100644 --- a/Userland/Applications/PartitionEditor/CMakeLists.txt +++ b/Userland/Applications/PartitionEditor/CMakeLists.txt @@ -7,9 +7,12 @@ compile_gml(PartitionEditorWindow.gml PartitionEditorWindowGML.h partition_edito set(SOURCES main.cpp - PartitionEditorWindowGML.h PartitionModel.cpp ) +set(GENERATED_SOURCES + PartitionEditorWindowGML.h +) + serenity_app(PartitionEditor ICON app-partition-editor) target_link_libraries(PartitionEditor LibMain LibGUI LibPartition) diff --git a/Userland/Applications/PixelPaint/CMakeLists.txt b/Userland/Applications/PixelPaint/CMakeLists.txt index c9d21e6347a..0e00b5c1912 100644 --- a/Userland/Applications/PixelPaint/CMakeLists.txt +++ b/Userland/Applications/PixelPaint/CMakeLists.txt @@ -16,9 +16,7 @@ set(SOURCES CreateNewImageDialog.cpp CreateNewLayerDialog.cpp EditGuideDialog.cpp - EditGuideDialogGML.h FilterGallery.cpp - FilterGalleryGML.h FilterTreeModel.cpp FilterPreviewWidget.cpp Filters/Bloom.cpp @@ -34,7 +32,6 @@ set(SOURCES Filters/LaplaceCardinal.cpp Filters/LaplaceDiagonal.cpp Filters/Median.cpp - Filters/MedianSettingsGML.h Filters/Sepia.cpp Filters/Sharpen.cpp HistogramWidget.cpp @@ -45,15 +42,12 @@ set(SOURCES Layer.cpp LayerListWidget.cpp LayerPropertiesWidget.cpp - LevelsDialogGML.h LevelsDialog.cpp MainWidget.cpp Mask.cpp PaletteWidget.cpp - PixelPaintWindowGML.h ProjectLoader.cpp ResizeImageDialog.cpp - ResizeImageDialogGML.h ScopeWidget.cpp Selection.cpp ToolPropertiesWidget.cpp @@ -76,7 +70,16 @@ set(SOURCES Tools/ZoomTool.cpp VectorscopeWidget.cpp main.cpp - ) +) + +set(GENERATED_SOURCES + EditGuideDialogGML.h + FilterGalleryGML.h + Filters/MedianSettingsGML.h + LevelsDialogGML.h + PixelPaintWindowGML.h + ResizeImageDialogGML.h +) serenity_app(PixelPaint ICON app-pixel-paint) target_link_libraries(PixelPaint LibImageDecoderClient LibGUI LibGfx LibFileSystemAccessClient LibConfig LibMain) diff --git a/Userland/Applications/Run/CMakeLists.txt b/Userland/Applications/Run/CMakeLists.txt index 0fe582ce826..43a99242e99 100644 --- a/Userland/Applications/Run/CMakeLists.txt +++ b/Userland/Applications/Run/CMakeLists.txt @@ -9,7 +9,9 @@ compile_gml(Run.gml RunGML.h run_gml) set(SOURCES main.cpp RunWindow.cpp - RunWindow.h +) + +set(GENERATED_SOURCES RunGML.h ) diff --git a/Userland/Applications/SpaceAnalyzer/CMakeLists.txt b/Userland/Applications/SpaceAnalyzer/CMakeLists.txt index f6115ea9651..0dd9dcfb48c 100644 --- a/Userland/Applications/SpaceAnalyzer/CMakeLists.txt +++ b/Userland/Applications/SpaceAnalyzer/CMakeLists.txt @@ -6,8 +6,11 @@ serenity_component( compile_gml(SpaceAnalyzer.gml SpaceAnalyzerGML.h space_analyzer_gml) set(SOURCES - main.cpp TreeMapWidget.cpp + main.cpp +) + +set(GENERATED_SOURCES SpaceAnalyzerGML.h ) diff --git a/Userland/Applications/Spreadsheet/CMakeLists.txt b/Userland/Applications/Spreadsheet/CMakeLists.txt index 9ba65171624..342378b3327 100644 --- a/Userland/Applications/Spreadsheet/CMakeLists.txt +++ b/Userland/Applications/Spreadsheet/CMakeLists.txt @@ -20,8 +20,6 @@ set(SOURCES CellType/String.cpp CellType/Type.cpp CellTypeDialog.cpp - CondFormattingGML.h - CondFormattingViewGML.h ExportDialog.cpp HelpWindow.cpp ImportDialog.cpp @@ -38,6 +36,8 @@ set(SOURCES set(GENERATED_SOURCES CSVExportGML.h CSVImportGML.h + CondFormattingGML.h + CondFormattingViewGML.h FormatSelectionPageGML.h ) diff --git a/Userland/Applications/SystemMonitor/CMakeLists.txt b/Userland/Applications/SystemMonitor/CMakeLists.txt index 4debbdbb70d..369f5694d64 100644 --- a/Userland/Applications/SystemMonitor/CMakeLists.txt +++ b/Userland/Applications/SystemMonitor/CMakeLists.txt @@ -18,6 +18,9 @@ set(SOURCES ProcessUnveiledPathsWidget.cpp ProcessStateWidget.cpp ThreadStackWidget.cpp +) + +set(GENERATED_SOURCES SystemMonitorGML.h ProcessWindowGML.h ) diff --git a/Userland/Applications/TerminalSettings/CMakeLists.txt b/Userland/Applications/TerminalSettings/CMakeLists.txt index 677113b7465..50f806f0448 100644 --- a/Userland/Applications/TerminalSettings/CMakeLists.txt +++ b/Userland/Applications/TerminalSettings/CMakeLists.txt @@ -8,8 +8,11 @@ compile_gml(TerminalSettingsMain.gml TerminalSettingsMainGML.h terminal_settings compile_gml(TerminalSettingsView.gml TerminalSettingsViewGML.h terminal_settings_view_gml) set(SOURCES - main.cpp TerminalSettingsWidget.cpp + main.cpp +) + +set(GENERATED_SOURCES TerminalSettingsMainGML.h TerminalSettingsViewGML.h ) diff --git a/Userland/Applications/TextEditor/CMakeLists.txt b/Userland/Applications/TextEditor/CMakeLists.txt index 8f842fed5cb..a6d5876d00d 100644 --- a/Userland/Applications/TextEditor/CMakeLists.txt +++ b/Userland/Applications/TextEditor/CMakeLists.txt @@ -8,9 +8,12 @@ serenity_component( compile_gml(TextEditorWindow.gml TextEditorWindowGML.h text_editor_window_gml) set(SOURCES - main.cpp FileArgument.cpp MainWidget.cpp + main.cpp +) + +set(GENERATED_SOURCES TextEditorWindowGML.h ) diff --git a/Userland/Applications/ThemeEditor/CMakeLists.txt b/Userland/Applications/ThemeEditor/CMakeLists.txt index ff9a28496d0..fa4e219fe3a 100644 --- a/Userland/Applications/ThemeEditor/CMakeLists.txt +++ b/Userland/Applications/ThemeEditor/CMakeLists.txt @@ -12,9 +12,12 @@ compile_gml(PathProperty.gml PathPropertyGML.h path_property_gml) compile_gml(Previews/WindowPreview.gml WindowPreviewGML.h window_preview_gml) set(SOURCES - main.cpp MainWidget.cpp PreviewWidget.cpp + main.cpp +) + +set(GENERATED_SOURCES AlignmentPropertyGML.h ColorPropertyGML.h FlagPropertyGML.h diff --git a/Userland/Applications/Welcome/CMakeLists.txt b/Userland/Applications/Welcome/CMakeLists.txt index 9efd15e5ba4..99a08fb01f0 100644 --- a/Userland/Applications/Welcome/CMakeLists.txt +++ b/Userland/Applications/Welcome/CMakeLists.txt @@ -7,11 +7,13 @@ serenity_component( compile_gml(WelcomeWindow.gml WelcomeWindowGML.h welcome_window_gml) set(SOURCES - WelcomeWindowGML.h WelcomeWidget.cpp - WelcomeWidget.h main.cpp ) +set(GENERATED_SOURCES + WelcomeWindowGML.h +) + serenity_app(Welcome ICON app-welcome) target_link_libraries(Welcome LibGUI LibWebView LibWeb LibMain) diff --git a/Userland/Demos/ModelGallery/CMakeLists.txt b/Userland/Demos/ModelGallery/CMakeLists.txt index 70a7dd10cb6..6094fe8d65f 100644 --- a/Userland/Demos/ModelGallery/CMakeLists.txt +++ b/Userland/Demos/ModelGallery/CMakeLists.txt @@ -9,6 +9,9 @@ set(SOURCES main.cpp GalleryWidget.cpp BasicModel.cpp +) + +set(GENERATED_SOURCES BasicModelTabGML.h ) diff --git a/Userland/Demos/WidgetGallery/CMakeLists.txt b/Userland/Demos/WidgetGallery/CMakeLists.txt index 3353f9d9654..14e2b9d5ca5 100644 --- a/Userland/Demos/WidgetGallery/CMakeLists.txt +++ b/Userland/Demos/WidgetGallery/CMakeLists.txt @@ -15,13 +15,16 @@ compile_gml(DemoWizardPage2.gml DemoWizardPage2GML.h demo_wizard_page_2_gml) set(SOURCES main.cpp GalleryWidget.cpp + DemoWizardDialog.cpp +) + +set(GENERATED_SOURCES WindowGML.h BasicsTabGML.h SlidersTabGML.h CursorsTabGML.h IconsTabGML.h WizardsTabGML.h - DemoWizardDialog.cpp DemoWizardPage1GML.h DemoWizardPage2GML.h ) diff --git a/Userland/DevTools/HackStudio/CMakeLists.txt b/Userland/DevTools/HackStudio/CMakeLists.txt index 095473ba887..e5aa6d20e77 100644 --- a/Userland/DevTools/HackStudio/CMakeLists.txt +++ b/Userland/DevTools/HackStudio/CMakeLists.txt @@ -23,15 +23,12 @@ set(SOURCES Debugger/RegistersModel.cpp Debugger/VariablesModel.cpp Dialogs/Git/GitCommitDialog.cpp - Dialogs/Git/GitCommitDialogGML.h Dialogs/NewProjectDialog.cpp - Dialogs/NewProjectDialogGML.h Dialogs/ProjectTemplatesModel.cpp Editor.cpp EditorWrapper.cpp FindInFilesWidget.cpp FindWidget.cpp - FindWidgetGML.h Git/DiffViewer.cpp Git/GitFilesModel.cpp Git/GitFilesView.cpp @@ -54,6 +51,12 @@ set(SOURCES main.cpp ) +set(GENERATED_SOURCES + Dialogs/Git/GitCommitDialogGML.h + Dialogs/NewProjectDialogGML.h + FindWidgetGML.h +) + serenity_app(HackStudio ICON app-hack-studio) target_link_libraries(HackStudio LibWebView LibWeb LibMarkdown LibGUI LibCpp LibGfx LibCore LibVT LibDebug LibX86 LibDiff LibShell LibSymbolication LibRegex LibSQL LibCoredump LibMain) add_dependencies(HackStudio CppLanguageServer) diff --git a/Userland/Games/GameOfLife/CMakeLists.txt b/Userland/Games/GameOfLife/CMakeLists.txt index dda37469ed0..ebfd2c3a0c7 100644 --- a/Userland/Games/GameOfLife/CMakeLists.txt +++ b/Userland/Games/GameOfLife/CMakeLists.txt @@ -10,9 +10,12 @@ set(SOURCES main.cpp Board.cpp BoardWidget.cpp - GameOfLifeGML.h Pattern.cpp ) +set(GENERATED_SOURCES + GameOfLifeGML.h +) + serenity_app(GameOfLife ICON app-gameoflife) target_link_libraries(GameOfLife LibGUI LibMain LibDesktop) diff --git a/Userland/Games/Hearts/CMakeLists.txt b/Userland/Games/Hearts/CMakeLists.txt index a0bc20ac16f..1ad67dbcac6 100644 --- a/Userland/Games/Hearts/CMakeLists.txt +++ b/Userland/Games/Hearts/CMakeLists.txt @@ -13,6 +13,9 @@ set(SOURCES Player.cpp ScoreCard.cpp SettingsDialog.cpp +) + +set(GENERATED_SOURCES HeartsGML.h ) diff --git a/Userland/Games/Minesweeper/CMakeLists.txt b/Userland/Games/Minesweeper/CMakeLists.txt index 5c5e2190680..bdaa8743fef 100644 --- a/Userland/Games/Minesweeper/CMakeLists.txt +++ b/Userland/Games/Minesweeper/CMakeLists.txt @@ -8,12 +8,15 @@ compile_gml(MinesweeperCustomGameWindow.gml MinesweeperCustomGameWindowGML.h min compile_gml(MinesweeperWindow.gml MinesweeperWindowGML.h minesweeper_window_gml) set(SOURCES - MinesweeperCustomGameWindowGML.h - MinesweeperWindowGML.h CustomGameDialog.cpp Field.cpp main.cpp ) +set(GENERATED_SOURCES + MinesweeperCustomGameWindowGML.h + MinesweeperWindowGML.h +) + serenity_app(Minesweeper ICON app-minesweeper) target_link_libraries(Minesweeper LibGUI LibConfig LibMain LibDesktop) diff --git a/Userland/Games/Solitaire/CMakeLists.txt b/Userland/Games/Solitaire/CMakeLists.txt index 9ee8c174a90..934402aa10e 100644 --- a/Userland/Games/Solitaire/CMakeLists.txt +++ b/Userland/Games/Solitaire/CMakeLists.txt @@ -9,6 +9,9 @@ compile_gml(Solitaire.gml SolitaireGML.h solitaire_gml) set(SOURCES Game.cpp main.cpp +) + +set(GENERATED_SOURCES SolitaireGML.h ) diff --git a/Userland/Games/Spider/CMakeLists.txt b/Userland/Games/Spider/CMakeLists.txt index f688fc8ac5e..39552f3ebee 100644 --- a/Userland/Games/Spider/CMakeLists.txt +++ b/Userland/Games/Spider/CMakeLists.txt @@ -9,6 +9,9 @@ compile_gml(Spider.gml SpiderGML.h spider_gml) set(SOURCES Game.cpp main.cpp +) + +set(GENERATED_SOURCES SpiderGML.h ) diff --git a/Userland/Libraries/LibGUI/CMakeLists.txt b/Userland/Libraries/LibGUI/CMakeLists.txt index 367f41cdfca..1b4a0d3dcd3 100644 --- a/Userland/Libraries/LibGUI/CMakeLists.txt +++ b/Userland/Libraries/LibGUI/CMakeLists.txt @@ -37,15 +37,12 @@ set(SOURCES DragOperation.cpp EditingEngine.cpp EmojiInputDialog.cpp - EmojiInputDialogGML.h Event.cpp FileIconProvider.cpp FilePicker.cpp - FilePickerDialogGML.h FileSystemModel.cpp FilteringProxyModel.cpp FontPicker.cpp - FontPickerDialogGML.h Frame.cpp GitCommitLexer.cpp GitCommitSyntaxHighlighter.cpp @@ -81,7 +78,6 @@ set(SOURCES OpacitySlider.cpp Painter.cpp PasswordInputDialog.cpp - PasswordInputDialogGML.h PersistentModelIndex.cpp Process.cpp ProcessChooser.cpp @@ -125,14 +121,18 @@ set(SOURCES ) set(GENERATED_SOURCES - ../../Services/WindowServer/WindowClientEndpoint.h - ../../Services/WindowServer/WindowServerEndpoint.h - ../../Services/WindowServer/WindowManagerClientEndpoint.h - ../../Services/WindowServer/WindowManagerServerEndpoint.h - ../../Services/NotificationServer/NotificationClientEndpoint.h - ../../Services/NotificationServer/NotificationServerEndpoint.h ../../Services/Clipboard/ClipboardClientEndpoint.h ../../Services/Clipboard/ClipboardServerEndpoint.h + ../../Services/NotificationServer/NotificationClientEndpoint.h + ../../Services/NotificationServer/NotificationServerEndpoint.h + ../../Services/WindowServer/WindowClientEndpoint.h + ../../Services/WindowServer/WindowManagerClientEndpoint.h + ../../Services/WindowServer/WindowManagerServerEndpoint.h + ../../Services/WindowServer/WindowServerEndpoint.h + EmojiInputDialogGML.h + FilePickerDialogGML.h + FontPickerDialogGML.h + PasswordInputDialogGML.h ) serenity_lib(LibGUI gui) diff --git a/Userland/Services/AudioServer/CMakeLists.txt b/Userland/Services/AudioServer/CMakeLists.txt index 838cffc6bee..3847afe91b0 100644 --- a/Userland/Services/AudioServer/CMakeLists.txt +++ b/Userland/Services/AudioServer/CMakeLists.txt @@ -11,6 +11,9 @@ set(SOURCES ConnectionFromClient.cpp Mixer.cpp main.cpp +) + +set(GENERATED_SOURCES AudioServerEndpoint.h AudioClientEndpoint.h ) diff --git a/Userland/Services/Clipboard/CMakeLists.txt b/Userland/Services/Clipboard/CMakeLists.txt index 1bfb4b47b0c..163442406cb 100644 --- a/Userland/Services/Clipboard/CMakeLists.txt +++ b/Userland/Services/Clipboard/CMakeLists.txt @@ -9,11 +9,14 @@ compile_ipc(ClipboardClient.ipc ClipboardClientEndpoint.h) set(SOURCES ConnectionFromClient.cpp - ClipboardClientEndpoint.h - ClipboardServerEndpoint.h Storage.cpp main.cpp ) +set(GENERATED_SOURCES + ClipboardClientEndpoint.h + ClipboardServerEndpoint.h +) + serenity_bin(Clipboard) target_link_libraries(Clipboard LibCore LibIPC LibMain) diff --git a/Userland/Services/ConfigServer/CMakeLists.txt b/Userland/Services/ConfigServer/CMakeLists.txt index a4d8776d086..665da8590ec 100644 --- a/Userland/Services/ConfigServer/CMakeLists.txt +++ b/Userland/Services/ConfigServer/CMakeLists.txt @@ -10,6 +10,9 @@ compile_ipc(ConfigClient.ipc ConfigClientEndpoint.h) set(SOURCES ConnectionFromClient.cpp main.cpp +) + +set(GENERATED_SOURCES ConfigServerEndpoint.h ConfigClientEndpoint.h ) diff --git a/Userland/Services/FileSystemAccessServer/CMakeLists.txt b/Userland/Services/FileSystemAccessServer/CMakeLists.txt index 1b7a69ac113..4801ff38cb3 100644 --- a/Userland/Services/FileSystemAccessServer/CMakeLists.txt +++ b/Userland/Services/FileSystemAccessServer/CMakeLists.txt @@ -10,6 +10,9 @@ compile_ipc(FileSystemAccessClient.ipc FileSystemAccessClientEndpoint.h) set(SOURCES ConnectionFromClient.cpp main.cpp +) + +set(GENERATED_SOURCES FileSystemAccessServerEndpoint.h FileSystemAccessClientEndpoint.h ) diff --git a/Userland/Services/ImageDecoder/CMakeLists.txt b/Userland/Services/ImageDecoder/CMakeLists.txt index ac26ae37c6a..4c30cba299a 100644 --- a/Userland/Services/ImageDecoder/CMakeLists.txt +++ b/Userland/Services/ImageDecoder/CMakeLists.txt @@ -9,6 +9,9 @@ compile_ipc(ImageDecoderClient.ipc ImageDecoderClientEndpoint.h) set(SOURCES ConnectionFromClient.cpp main.cpp +) + +set(GENERATED_SOURCES ImageDecoderServerEndpoint.h ImageDecoderClientEndpoint.h ) diff --git a/Userland/Services/InspectorServer/CMakeLists.txt b/Userland/Services/InspectorServer/CMakeLists.txt index 2459a6360b3..4dad519d1ce 100644 --- a/Userland/Services/InspectorServer/CMakeLists.txt +++ b/Userland/Services/InspectorServer/CMakeLists.txt @@ -11,6 +11,9 @@ set(SOURCES ConnectionFromClient.cpp main.cpp InspectableProcess.cpp +) + +set(GENERATED_SOURCES InspectorServerEndpoint.h InspectorClientEndpoint.h ) diff --git a/Userland/Services/LaunchServer/CMakeLists.txt b/Userland/Services/LaunchServer/CMakeLists.txt index 89727d9bf7f..71699b686af 100644 --- a/Userland/Services/LaunchServer/CMakeLists.txt +++ b/Userland/Services/LaunchServer/CMakeLists.txt @@ -11,6 +11,9 @@ set(SOURCES ConnectionFromClient.cpp Launcher.cpp main.cpp +) + +set(GENERATED_SOURCES LaunchClientEndpoint.h LaunchServerEndpoint.h ) diff --git a/Userland/Services/LoginServer/CMakeLists.txt b/Userland/Services/LoginServer/CMakeLists.txt index e341c889741..854eab1e6a9 100644 --- a/Userland/Services/LoginServer/CMakeLists.txt +++ b/Userland/Services/LoginServer/CMakeLists.txt @@ -7,10 +7,13 @@ serenity_component( compile_gml(LoginWindow.gml LoginWindowGML.h login_window_gml) set(SOURCES - LoginWindowGML.h LoginWindow.cpp main.cpp ) +set(GENERATED_SOURCES + LoginWindowGML.h +) + serenity_bin(LoginServer) target_link_libraries(LoginServer LibGUI LibMain) diff --git a/Userland/Services/LookupServer/CMakeLists.txt b/Userland/Services/LookupServer/CMakeLists.txt index b4be1ec03c4..01b63ff5376 100644 --- a/Userland/Services/LookupServer/CMakeLists.txt +++ b/Userland/Services/LookupServer/CMakeLists.txt @@ -10,12 +10,15 @@ compile_ipc(LookupClient.ipc LookupClientEndpoint.h) set(SOURCES DNSServer.cpp LookupServer.cpp - LookupServerEndpoint.h - LookupClientEndpoint.h ConnectionFromClient.cpp MulticastDNS.cpp main.cpp ) +set(GENERATED_SOURCES + LookupServerEndpoint.h + LookupClientEndpoint.h +) + serenity_bin(LookupServer) target_link_libraries(LookupServer LibCore LibDNS LibIPC LibMain) diff --git a/Userland/Services/NotificationServer/CMakeLists.txt b/Userland/Services/NotificationServer/CMakeLists.txt index de61a0f3b9c..2b95551b692 100644 --- a/Userland/Services/NotificationServer/CMakeLists.txt +++ b/Userland/Services/NotificationServer/CMakeLists.txt @@ -11,6 +11,9 @@ set(SOURCES ConnectionFromClient.cpp main.cpp NotificationWindow.cpp +) + +set(GENERATED_SOURCES NotificationServerEndpoint.h NotificationClientEndpoint.h ) diff --git a/Userland/Services/RequestServer/CMakeLists.txt b/Userland/Services/RequestServer/CMakeLists.txt index 627fbef756f..28ff8247583 100644 --- a/Userland/Services/RequestServer/CMakeLists.txt +++ b/Userland/Services/RequestServer/CMakeLists.txt @@ -10,8 +10,6 @@ set(SOURCES ConnectionFromClient.cpp ConnectionCache.cpp Request.cpp - RequestClientEndpoint.h - RequestServerEndpoint.h GeminiRequest.cpp GeminiProtocol.cpp HttpRequest.cpp @@ -22,5 +20,10 @@ set(SOURCES Protocol.cpp ) +set(GENERATED_SOURCES + RequestClientEndpoint.h + RequestServerEndpoint.h +) + serenity_bin(RequestServer) target_link_libraries(RequestServer LibCore LibIPC LibGemini LibHTTP LibMain) diff --git a/Userland/Services/SQLServer/CMakeLists.txt b/Userland/Services/SQLServer/CMakeLists.txt index 0f6a6800290..5c9104f8782 100644 --- a/Userland/Services/SQLServer/CMakeLists.txt +++ b/Userland/Services/SQLServer/CMakeLists.txt @@ -11,10 +11,13 @@ set(SOURCES ConnectionFromClient.cpp DatabaseConnection.cpp main.cpp + SQLStatement.cpp +) + +set(GENERATED_SOURCES SQLClientEndpoint.h SQLServerEndpoint.h - SQLStatement.cpp - ) +) serenity_bin(SQLServer) target_link_libraries(SQLServer LibCore LibIPC LibSQL LibMain) diff --git a/Userland/Services/WebContent/CMakeLists.txt b/Userland/Services/WebContent/CMakeLists.txt index e4643e70c4e..526ed826108 100644 --- a/Userland/Services/WebContent/CMakeLists.txt +++ b/Userland/Services/WebContent/CMakeLists.txt @@ -12,12 +12,15 @@ set(SOURCES ConsoleGlobalObject.cpp ImageCodecPluginSerenity.cpp PageHost.cpp - WebContentClientEndpoint.h WebContentConsoleClient.cpp - WebContentServerEndpoint.h main.cpp ) +set(GENERATED_SOURCES + WebContentClientEndpoint.h + WebContentServerEndpoint.h +) + serenity_bin(WebContent) target_link_libraries(WebContent LibCore LibIPC LibGfx LibImageDecoderClient LibWebView LibWeb LibMain) link_with_locale_data(WebContent) diff --git a/Userland/Services/WebSocket/CMakeLists.txt b/Userland/Services/WebSocket/CMakeLists.txt index ccff113db91..bdd24d9fd71 100644 --- a/Userland/Services/WebSocket/CMakeLists.txt +++ b/Userland/Services/WebSocket/CMakeLists.txt @@ -9,6 +9,9 @@ compile_ipc(WebSocketClient.ipc WebSocketClientEndpoint.h) set(SOURCES ConnectionFromClient.cpp main.cpp +) + +set(GENERATED_SOURCES WebSocketClientEndpoint.h WebSocketServerEndpoint.h ) diff --git a/Userland/Services/WindowServer/CMakeLists.txt b/Userland/Services/WindowServer/CMakeLists.txt index f23ed083a79..ca219e1b727 100644 --- a/Userland/Services/WindowServer/CMakeLists.txt +++ b/Userland/Services/WindowServer/CMakeLists.txt @@ -33,12 +33,15 @@ set(SOURCES WindowManager.cpp WindowStack.cpp WindowSwitcher.cpp + WMConnectionFromClient.cpp + KeymapSwitcher.cpp +) + +set(GENERATED_SOURCES WindowServerEndpoint.h WindowClientEndpoint.h WindowManagerServerEndpoint.h WindowManagerClientEndpoint.h - WMConnectionFromClient.cpp - KeymapSwitcher.cpp ) serenity_bin(WindowServer)