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

@@ -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)

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)

Userland/Applications/Calculator/CMakeLists.txt

@@ -11,6 +11,9 @@ set(SOURCES
     CalculatorWidget.cpp
     RoundingDialog.cpp
     Keypad.cpp
+)
+
+set(GENERATED_SOURCES
     CalculatorGML.h
 )
 

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)

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
 )
 

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)

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
 )
 

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
 )
 

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)

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)

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)

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)

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)

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

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
 )

Userland/Applications/Magnifier/CMakeLists.txt

@@ -6,7 +6,6 @@ serenity_component(
 
 set(SOURCES
     MagnifierWidget.cpp
-    MagnifierWidget.h
     main.cpp
 )
 

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)

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
 )
 

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
 )
 

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)

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)

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)

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
 )
 

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
 )
 

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
 )
 

Userland/Applications/SystemMonitor/CMakeLists.txt

@@ -18,6 +18,9 @@ set(SOURCES
     ProcessUnveiledPathsWidget.cpp
     ProcessStateWidget.cpp
     ThreadStackWidget.cpp
+)
+
+set(GENERATED_SOURCES
     SystemMonitorGML.h
     ProcessWindowGML.h
 )

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
 )

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
 )
 

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

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)