diff --git a/Base/usr/share/man/man5/GML/Usage.md b/Base/usr/share/man/man5/GML/Usage.md index e36f346acc..70e2280bfb 100644 --- a/Base/usr/share/man/man5/GML/Usage.md +++ b/Base/usr/share/man/man5/GML/Usage.md @@ -8,10 +8,10 @@ How to use GML in SerenityOS C++ applications ## CMake -Include `compile_gml()` your applications CMake file. The header file name and GML string name are not fixed but must follow this convention. +Include `stringify_gml()` your applications CMake file. The header file name and GML string name are not fixed but must follow this convention. ```cmake -compile_gml(MyApp.gml MyAppGML.h my_app_gml) +stringify_gml(MyApp.gml MyAppGML.h my_app_gml) ``` Include the name of the header file that will be compiled from your GML file in your `SOURCES`. diff --git a/Meta/CMake/code_generators.cmake b/Meta/CMake/code_generators.cmake index 7fc93b7689..c7d9b60948 100644 --- a/Meta/CMake/code_generators.cmake +++ b/Meta/CMake/code_generators.cmake @@ -2,7 +2,7 @@ # Functions for generating sources using host tools # -function(compile_gml source output string_name) +function(stringify_gml source output string_name) set(source ${CMAKE_CURRENT_SOURCE_DIR}/${source}) add_custom_command( OUTPUT ${output} diff --git a/Userland/Applications/Browser/CMakeLists.txt b/Userland/Applications/Browser/CMakeLists.txt index e51c8ebe91..69a5a1bf75 100644 --- a/Userland/Applications/Browser/CMakeLists.txt +++ b/Userland/Applications/Browser/CMakeLists.txt @@ -5,11 +5,11 @@ serenity_component( DEPENDS BrowserSettings ImageDecoder RequestServer WebContent WebSocket ) -compile_gml(BrowserWindow.gml BrowserWindowGML.h browser_window_gml) -compile_gml(EditBookmark.gml EditBookmarkGML.h edit_bookmark_gml) -compile_gml(History/HistoryWidget.gml HistoryWidgetGML.h history_widget_gml) -compile_gml(StorageWidget.gml StorageWidgetGML.h storage_widget_gml) -compile_gml(Tab.gml TabGML.h tab_gml) +stringify_gml(BrowserWindow.gml BrowserWindowGML.h browser_window_gml) +stringify_gml(EditBookmark.gml EditBookmarkGML.h edit_bookmark_gml) +stringify_gml(History/HistoryWidget.gml HistoryWidgetGML.h history_widget_gml) +stringify_gml(StorageWidget.gml StorageWidgetGML.h storage_widget_gml) +stringify_gml(Tab.gml TabGML.h tab_gml) set(SOURCES BookmarksBarWidget.cpp diff --git a/Userland/Applications/BrowserSettings/CMakeLists.txt b/Userland/Applications/BrowserSettings/CMakeLists.txt index 5627c250d5..bcfee8aa69 100644 --- a/Userland/Applications/BrowserSettings/CMakeLists.txt +++ b/Userland/Applications/BrowserSettings/CMakeLists.txt @@ -4,9 +4,9 @@ serenity_component( TARGETS BrowserSettings ) -compile_gml(AutoplaySettingsWidget.gml AutoplaySettingsWidgetGML.h autoplay_settings_widget_gml) -compile_gml(BrowserSettingsWidget.gml BrowserSettingsWidgetGML.h browser_settings_widget_gml) -compile_gml(ContentFilterSettingsWidget.gml ContentFilterSettingsWidgetGML.h content_filter_settings_widget_gml) +stringify_gml(AutoplaySettingsWidget.gml AutoplaySettingsWidgetGML.h autoplay_settings_widget_gml) +stringify_gml(BrowserSettingsWidget.gml BrowserSettingsWidgetGML.h browser_settings_widget_gml) +stringify_gml(ContentFilterSettingsWidget.gml ContentFilterSettingsWidgetGML.h content_filter_settings_widget_gml) set(SOURCES AutoplaySettingsWidget.cpp diff --git a/Userland/Applications/Calculator/CMakeLists.txt b/Userland/Applications/Calculator/CMakeLists.txt index 2ffec7a22d..bf3ac1f46e 100644 --- a/Userland/Applications/Calculator/CMakeLists.txt +++ b/Userland/Applications/Calculator/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS Calculator ) -compile_gml(CalculatorWindow.gml CalculatorGML.h calculator_gml) +stringify_gml(CalculatorWindow.gml CalculatorGML.h calculator_gml) set(SOURCES main.cpp Calculator.cpp diff --git a/Userland/Applications/Calendar/CMakeLists.txt b/Userland/Applications/Calendar/CMakeLists.txt index 7d22f4dff9..618901fb21 100644 --- a/Userland/Applications/Calendar/CMakeLists.txt +++ b/Userland/Applications/Calendar/CMakeLists.txt @@ -3,7 +3,7 @@ serenity_component( TARGETS Calendar ) -compile_gml(CalendarWindow.gml CalendarWindowGML.h calendar_window_gml) +stringify_gml(CalendarWindow.gml CalendarWindowGML.h calendar_window_gml) set(SOURCES AddEventDialog.cpp diff --git a/Userland/Applications/CalendarSettings/CMakeLists.txt b/Userland/Applications/CalendarSettings/CMakeLists.txt index b2c2c6bb00..19145c166e 100644 --- a/Userland/Applications/CalendarSettings/CMakeLists.txt +++ b/Userland/Applications/CalendarSettings/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS CalendarSettings ) -compile_gml(CalendarSettingsWidget.gml CalendarSettingsWidgetGML.h calendar_settings_widget_gml) +stringify_gml(CalendarSettingsWidget.gml CalendarSettingsWidgetGML.h calendar_settings_widget_gml) set(SOURCES main.cpp diff --git a/Userland/Applications/CertificateSettings/CMakeLists.txt b/Userland/Applications/CertificateSettings/CMakeLists.txt index 1884f33b6a..8c1491b4da 100644 --- a/Userland/Applications/CertificateSettings/CMakeLists.txt +++ b/Userland/Applications/CertificateSettings/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS CertificateSettings ) -compile_gml(CertificateStoreWidget.gml CertificateStoreWidgetGML.h certificate_store_widget_gml) +stringify_gml(CertificateStoreWidget.gml CertificateStoreWidgetGML.h certificate_store_widget_gml) set(SOURCES CertificateStoreWidget.cpp diff --git a/Userland/Applications/CharacterMap/CMakeLists.txt b/Userland/Applications/CharacterMap/CMakeLists.txt index c92ce2508a..053bce24d2 100644 --- a/Userland/Applications/CharacterMap/CMakeLists.txt +++ b/Userland/Applications/CharacterMap/CMakeLists.txt @@ -4,8 +4,8 @@ serenity_component( TARGETS CharacterMap ) -compile_gml(CharacterMapWindow.gml CharacterMapWindowGML.h character_map_window_gml) -compile_gml(CharacterSearchWindow.gml CharacterSearchWindowGML.h character_search_window_gml) +stringify_gml(CharacterMapWindow.gml CharacterMapWindowGML.h character_map_window_gml) +stringify_gml(CharacterSearchWindow.gml CharacterSearchWindowGML.h character_search_window_gml) set(SOURCES CharacterMapWidget.cpp diff --git a/Userland/Applications/ClockSettings/CMakeLists.txt b/Userland/Applications/ClockSettings/CMakeLists.txt index 4278a4caf7..bd099820a6 100644 --- a/Userland/Applications/ClockSettings/CMakeLists.txt +++ b/Userland/Applications/ClockSettings/CMakeLists.txt @@ -4,8 +4,8 @@ serenity_component( TARGETS ClockSettings ) -compile_gml(ClockSettingsWidget.gml ClockSettingsWidgetGML.h clock_settings_widget_gml) -compile_gml(TimeZoneSettingsWidget.gml TimeZoneSettingsWidgetGML.h time_zone_settings_widget_gml) +stringify_gml(ClockSettingsWidget.gml ClockSettingsWidgetGML.h clock_settings_widget_gml) +stringify_gml(TimeZoneSettingsWidget.gml TimeZoneSettingsWidgetGML.h time_zone_settings_widget_gml) set(SOURCES main.cpp diff --git a/Userland/Applications/CrashReporter/CMakeLists.txt b/Userland/Applications/CrashReporter/CMakeLists.txt index e6da9f0168..e23b758b20 100644 --- a/Userland/Applications/CrashReporter/CMakeLists.txt +++ b/Userland/Applications/CrashReporter/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS CrashReporter ) -compile_gml(CrashReporterWindow.gml CrashReporterWindowGML.h crash_reporter_window_gml) +stringify_gml(CrashReporterWindow.gml CrashReporterWindowGML.h crash_reporter_window_gml) set(SOURCES diff --git a/Userland/Applications/DisplaySettings/CMakeLists.txt b/Userland/Applications/DisplaySettings/CMakeLists.txt index 61ed59e9d6..469f10dc7a 100644 --- a/Userland/Applications/DisplaySettings/CMakeLists.txt +++ b/Userland/Applications/DisplaySettings/CMakeLists.txt @@ -4,12 +4,12 @@ serenity_component( TARGETS DisplaySettings ) -compile_gml(BackgroundSettings.gml BackgroundSettingsGML.h background_settings_gml) -compile_gml(DesktopSettings.gml DesktopSettingsGML.h desktop_settings_gml) -compile_gml(EffectsSettings.gml EffectsSettingsGML.h effects_settings_gml) -compile_gml(FontSettings.gml FontSettingsGML.h font_settings_gml) -compile_gml(MonitorSettings.gml MonitorSettingsGML.h monitor_settings_window_gml) -compile_gml(ThemesSettings.gml ThemesSettingsGML.h themes_settings_gml) +stringify_gml(BackgroundSettings.gml BackgroundSettingsGML.h background_settings_gml) +stringify_gml(DesktopSettings.gml DesktopSettingsGML.h desktop_settings_gml) +stringify_gml(EffectsSettings.gml EffectsSettingsGML.h effects_settings_gml) +stringify_gml(FontSettings.gml FontSettingsGML.h font_settings_gml) +stringify_gml(MonitorSettings.gml MonitorSettingsGML.h monitor_settings_window_gml) +stringify_gml(ThemesSettings.gml ThemesSettingsGML.h themes_settings_gml) set(SOURCES BackgroundSettingsWidget.cpp diff --git a/Userland/Applications/Escalator/CMakeLists.txt b/Userland/Applications/Escalator/CMakeLists.txt index 3078c620e4..25114decb4 100644 --- a/Userland/Applications/Escalator/CMakeLists.txt +++ b/Userland/Applications/Escalator/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS Escalator ) -compile_gml(Escalator.gml EscalatorGML.h escalator_gml) +stringify_gml(Escalator.gml EscalatorGML.h escalator_gml) set(SOURCES main.cpp diff --git a/Userland/Applications/FileManager/CMakeLists.txt b/Userland/Applications/FileManager/CMakeLists.txt index 3c088bd20a..d9aa0e3e7b 100644 --- a/Userland/Applications/FileManager/CMakeLists.txt +++ b/Userland/Applications/FileManager/CMakeLists.txt @@ -5,14 +5,14 @@ serenity_component( DEPENDS FileOperation ) -compile_gml(FileManagerWindow.gml FileManagerWindowGML.h file_manager_window_gml) -compile_gml(FileOperationProgress.gml FileOperationProgressGML.h file_operation_progress_gml) -compile_gml(PropertiesWindowArchiveTab.gml PropertiesWindowArchiveTabGML.h properties_window_archive_tab_gml) -compile_gml(PropertiesWindowAudioTab.gml PropertiesWindowAudioTabGML.h properties_window_audio_tab_gml) -compile_gml(PropertiesWindowFontTab.gml PropertiesWindowFontTabGML.h properties_window_font_tab_gml) -compile_gml(PropertiesWindowGeneralTab.gml PropertiesWindowGeneralTabGML.h properties_window_general_tab_gml) -compile_gml(PropertiesWindowImageTab.gml PropertiesWindowImageTabGML.h properties_window_image_tab_gml) -compile_gml(PropertiesWindowPDFTab.gml PropertiesWindowPDFTabGML.h properties_window_pdf_tab_gml) +stringify_gml(FileManagerWindow.gml FileManagerWindowGML.h file_manager_window_gml) +stringify_gml(FileOperationProgress.gml FileOperationProgressGML.h file_operation_progress_gml) +stringify_gml(PropertiesWindowArchiveTab.gml PropertiesWindowArchiveTabGML.h properties_window_archive_tab_gml) +stringify_gml(PropertiesWindowAudioTab.gml PropertiesWindowAudioTabGML.h properties_window_audio_tab_gml) +stringify_gml(PropertiesWindowFontTab.gml PropertiesWindowFontTabGML.h properties_window_font_tab_gml) +stringify_gml(PropertiesWindowGeneralTab.gml PropertiesWindowGeneralTabGML.h properties_window_general_tab_gml) +stringify_gml(PropertiesWindowImageTab.gml PropertiesWindowImageTabGML.h properties_window_image_tab_gml) +stringify_gml(PropertiesWindowPDFTab.gml PropertiesWindowPDFTabGML.h properties_window_pdf_tab_gml) set(SOURCES DesktopWidget.cpp diff --git a/Userland/Applications/FontEditor/CMakeLists.txt b/Userland/Applications/FontEditor/CMakeLists.txt index 3beeece431..9d03e0796c 100644 --- a/Userland/Applications/FontEditor/CMakeLists.txt +++ b/Userland/Applications/FontEditor/CMakeLists.txt @@ -5,10 +5,10 @@ serenity_component( ) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -compile_gml(FontEditorWindow.gml FontEditorWindowGML.h font_editor_window_gml) -compile_gml(FontPreviewWindow.gml FontPreviewWindowGML.h font_preview_window_gml) -compile_gml(NewFontDialogPage1.gml NewFontDialogPage1GML.h new_font_dialog_page_1_gml) -compile_gml(NewFontDialogPage2.gml NewFontDialogPage2GML.h new_font_dialog_page_2_gml) +stringify_gml(FontEditorWindow.gml FontEditorWindowGML.h font_editor_window_gml) +stringify_gml(FontPreviewWindow.gml FontPreviewWindowGML.h font_preview_window_gml) +stringify_gml(NewFontDialogPage1.gml NewFontDialogPage1GML.h new_font_dialog_page_1_gml) +stringify_gml(NewFontDialogPage2.gml NewFontDialogPage2GML.h new_font_dialog_page_2_gml) set(SOURCES MainWidget.cpp diff --git a/Userland/Applications/GamesSettings/CMakeLists.txt b/Userland/Applications/GamesSettings/CMakeLists.txt index 6edfea6ca8..4b854981f3 100644 --- a/Userland/Applications/GamesSettings/CMakeLists.txt +++ b/Userland/Applications/GamesSettings/CMakeLists.txt @@ -4,8 +4,8 @@ serenity_component( TARGETS GamesSettings ) -compile_gml(CardSettingsWidget.gml CardSettingsWidgetGML.h card_settings_widget_gml) -compile_gml(ChessSettingsWidget.gml ChessSettingsWidgetGML.h chess_settings_widget_gml) +stringify_gml(CardSettingsWidget.gml CardSettingsWidgetGML.h card_settings_widget_gml) +stringify_gml(ChessSettingsWidget.gml ChessSettingsWidgetGML.h chess_settings_widget_gml) set(SOURCES main.cpp diff --git a/Userland/Applications/Help/CMakeLists.txt b/Userland/Applications/Help/CMakeLists.txt index 8c9946854d..ebc8057cc5 100644 --- a/Userland/Applications/Help/CMakeLists.txt +++ b/Userland/Applications/Help/CMakeLists.txt @@ -5,7 +5,7 @@ serenity_component( DEPENDS WebContent ) -compile_gml(HelpWindow.gml HelpWindowGML.h help_window_gml) +stringify_gml(HelpWindow.gml HelpWindowGML.h help_window_gml) set(SOURCES History.cpp diff --git a/Userland/Applications/HexEditor/CMakeLists.txt b/Userland/Applications/HexEditor/CMakeLists.txt index 652d75ab58..a758818ba0 100644 --- a/Userland/Applications/HexEditor/CMakeLists.txt +++ b/Userland/Applications/HexEditor/CMakeLists.txt @@ -4,9 +4,9 @@ serenity_component( TARGETS HexEditor ) -compile_gml(HexEditorWindow.gml HexEditorWindowGML.h hex_editor_window_gml) -compile_gml(GoToOffsetDialog.gml GoToOffsetDialogGML.h go_to_offset_dialog_gml) -compile_gml(FindDialog.gml FindDialogGML.h find_dialog_gml) +stringify_gml(HexEditorWindow.gml HexEditorWindowGML.h hex_editor_window_gml) +stringify_gml(GoToOffsetDialog.gml GoToOffsetDialogGML.h go_to_offset_dialog_gml) +stringify_gml(FindDialog.gml FindDialogGML.h find_dialog_gml) set(SOURCES FindDialog.cpp diff --git a/Userland/Applications/KeyboardSettings/CMakeLists.txt b/Userland/Applications/KeyboardSettings/CMakeLists.txt index 65cbf3e3b5..8de2daeda6 100644 --- a/Userland/Applications/KeyboardSettings/CMakeLists.txt +++ b/Userland/Applications/KeyboardSettings/CMakeLists.txt @@ -4,8 +4,8 @@ serenity_component( TARGETS KeyboardSettings ) -compile_gml(Keyboard.gml KeyboardWidgetGML.h keyboard_widget_gml) -compile_gml(KeymapDialog.gml KeymapDialogGML.h keymap_dialog_gml) +stringify_gml(Keyboard.gml KeyboardWidgetGML.h keyboard_widget_gml) +stringify_gml(KeymapDialog.gml KeymapDialogGML.h keymap_dialog_gml) set(SOURCES KeyboardSettingsWidget.cpp diff --git a/Userland/Applications/Mail/CMakeLists.txt b/Userland/Applications/Mail/CMakeLists.txt index 45bb5fd718..cd8ba0c12a 100644 --- a/Userland/Applications/Mail/CMakeLists.txt +++ b/Userland/Applications/Mail/CMakeLists.txt @@ -5,7 +5,7 @@ serenity_component( DEPENDS WebContent ) -compile_gml(MailWindow.gml MailWindowGML.h mail_window_gml) +stringify_gml(MailWindow.gml MailWindowGML.h mail_window_gml) set(SOURCES AccountHolder.cpp diff --git a/Userland/Applications/MailSettings/CMakeLists.txt b/Userland/Applications/MailSettings/CMakeLists.txt index 7e6eaf9f90..86a8ca5233 100644 --- a/Userland/Applications/MailSettings/CMakeLists.txt +++ b/Userland/Applications/MailSettings/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS MailSettings ) -compile_gml(MailSettingsWidget.gml MailSettingsWidgetGML.h mail_settings_widget_gml) +stringify_gml(MailSettingsWidget.gml MailSettingsWidgetGML.h mail_settings_widget_gml) set(SOURCES main.cpp diff --git a/Userland/Applications/MouseSettings/CMakeLists.txt b/Userland/Applications/MouseSettings/CMakeLists.txt index ac474039ba..172ba6b290 100644 --- a/Userland/Applications/MouseSettings/CMakeLists.txt +++ b/Userland/Applications/MouseSettings/CMakeLists.txt @@ -4,9 +4,9 @@ serenity_component( TARGETS MouseSettings ) -compile_gml(Mouse.gml MouseWidgetGML.h mouse_widget_gml) -compile_gml(Theme.gml ThemeWidgetGML.h theme_widget_gml) -compile_gml(Highlight.gml HighlightWidgetGML.h highlight_widget_gml) +stringify_gml(Mouse.gml MouseWidgetGML.h mouse_widget_gml) +stringify_gml(Theme.gml ThemeWidgetGML.h theme_widget_gml) +stringify_gml(Highlight.gml HighlightWidgetGML.h highlight_widget_gml) set(SOURCES DoubleClickArrowWidget.cpp diff --git a/Userland/Applications/NetworkSettings/CMakeLists.txt b/Userland/Applications/NetworkSettings/CMakeLists.txt index a190c8c5c0..e4e9bc1674 100644 --- a/Userland/Applications/NetworkSettings/CMakeLists.txt +++ b/Userland/Applications/NetworkSettings/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS NetworkSettings ) -compile_gml(NetworkSettings.gml NetworkSettingsGML.h network_settings_gml) +stringify_gml(NetworkSettings.gml NetworkSettingsGML.h network_settings_gml) set(SOURCES NetworkSettingsWidget.cpp diff --git a/Userland/Applications/PartitionEditor/CMakeLists.txt b/Userland/Applications/PartitionEditor/CMakeLists.txt index 79294f42f0..93e4fc0889 100644 --- a/Userland/Applications/PartitionEditor/CMakeLists.txt +++ b/Userland/Applications/PartitionEditor/CMakeLists.txt @@ -3,7 +3,7 @@ serenity_component( TARGETS PartitionEditor ) -compile_gml(PartitionEditorWindow.gml PartitionEditorWindowGML.h partition_editor_window_gml) +stringify_gml(PartitionEditorWindow.gml PartitionEditorWindowGML.h partition_editor_window_gml) set(SOURCES main.cpp diff --git a/Userland/Applications/Piano/CMakeLists.txt b/Userland/Applications/Piano/CMakeLists.txt index 37048126cb..b538ef0ad0 100644 --- a/Userland/Applications/Piano/CMakeLists.txt +++ b/Userland/Applications/Piano/CMakeLists.txt @@ -5,7 +5,7 @@ serenity_component( DEPENDS AudioServer ) -compile_gml(ExportProgressWidget.gml ExportProgressWidget.h export_progress_widget) +stringify_gml(ExportProgressWidget.gml ExportProgressWidget.h export_progress_widget) set(SOURCES AudioPlayerLoop.cpp diff --git a/Userland/Applications/PixelPaint/CMakeLists.txt b/Userland/Applications/PixelPaint/CMakeLists.txt index 8c7bc4457d..1f33c9ba23 100644 --- a/Userland/Applications/PixelPaint/CMakeLists.txt +++ b/Userland/Applications/PixelPaint/CMakeLists.txt @@ -5,14 +5,14 @@ serenity_component( DEPENDS ImageDecoder FileSystemAccessServer ) -compile_gml(PixelPaintWindow.gml PixelPaintWindowGML.h pixel_paint_window_gml) -compile_gml(EditGuideDialog.gml EditGuideDialogGML.h edit_guide_dialog_gml) -compile_gml(FilterGallery.gml FilterGalleryGML.h filter_gallery_gml) -compile_gml(ResizeImageDialog.gml ResizeImageDialogGML.h resize_image_dialog_gml) -compile_gml(LevelsDialog.gml LevelsDialogGML.h levels_dialog_gml) -compile_gml(LuminosityMasking.gml LuminosityMaskingGML.h luminosity_masking_gml) -compile_gml(ColorMasking.gml ColorMaskingGML.h color_masking_gml) -compile_gml(Filters/MedianSettings.gml Filters/MedianSettingsGML.h median_settings_gml) +stringify_gml(PixelPaintWindow.gml PixelPaintWindowGML.h pixel_paint_window_gml) +stringify_gml(EditGuideDialog.gml EditGuideDialogGML.h edit_guide_dialog_gml) +stringify_gml(FilterGallery.gml FilterGalleryGML.h filter_gallery_gml) +stringify_gml(ResizeImageDialog.gml ResizeImageDialogGML.h resize_image_dialog_gml) +stringify_gml(LevelsDialog.gml LevelsDialogGML.h levels_dialog_gml) +stringify_gml(LuminosityMasking.gml LuminosityMaskingGML.h luminosity_masking_gml) +stringify_gml(ColorMasking.gml ColorMaskingGML.h color_masking_gml) +stringify_gml(Filters/MedianSettings.gml Filters/MedianSettingsGML.h median_settings_gml) set(SOURCES CreateNewImageDialog.cpp diff --git a/Userland/Applications/Run/CMakeLists.txt b/Userland/Applications/Run/CMakeLists.txt index 777a876f63..72d6726ca7 100644 --- a/Userland/Applications/Run/CMakeLists.txt +++ b/Userland/Applications/Run/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS Run ) -compile_gml(Run.gml RunGML.h run_gml) +stringify_gml(Run.gml RunGML.h run_gml) set(SOURCES main.cpp diff --git a/Userland/Applications/SpaceAnalyzer/CMakeLists.txt b/Userland/Applications/SpaceAnalyzer/CMakeLists.txt index a6f1e4c3c4..7cfe96b4ca 100644 --- a/Userland/Applications/SpaceAnalyzer/CMakeLists.txt +++ b/Userland/Applications/SpaceAnalyzer/CMakeLists.txt @@ -3,7 +3,7 @@ serenity_component( TARGETS SpaceAnalyzer ) -compile_gml(SpaceAnalyzer.gml SpaceAnalyzerGML.h space_analyzer_gml) +stringify_gml(SpaceAnalyzer.gml SpaceAnalyzerGML.h space_analyzer_gml) set(SOURCES ProgressWindow.cpp diff --git a/Userland/Applications/Spreadsheet/CMakeLists.txt b/Userland/Applications/Spreadsheet/CMakeLists.txt index f800fd4288..1c03f149bf 100644 --- a/Userland/Applications/Spreadsheet/CMakeLists.txt +++ b/Userland/Applications/Spreadsheet/CMakeLists.txt @@ -4,11 +4,11 @@ serenity_component( DEPENDS WebContent ) -compile_gml(CondFormatting.gml CondFormattingGML.h cond_fmt_gml) -compile_gml(CondView.gml CondFormattingViewGML.h cond_fmt_view_gml) -compile_gml(csv_import.gml CSVImportGML.h csv_import_gml) -compile_gml(csv_export.gml CSVExportGML.h csv_export_gml) -compile_gml(select_format_page.gml FormatSelectionPageGML.h select_format_page_gml) +stringify_gml(CondFormatting.gml CondFormattingGML.h cond_fmt_gml) +stringify_gml(CondView.gml CondFormattingViewGML.h cond_fmt_view_gml) +stringify_gml(csv_import.gml CSVImportGML.h csv_import_gml) +stringify_gml(csv_export.gml CSVExportGML.h csv_export_gml) +stringify_gml(select_format_page.gml FormatSelectionPageGML.h select_format_page_gml) set(SOURCES Cell.cpp diff --git a/Userland/Applications/SystemMonitor/CMakeLists.txt b/Userland/Applications/SystemMonitor/CMakeLists.txt index 5b7df76e83..36d135bc7c 100644 --- a/Userland/Applications/SystemMonitor/CMakeLists.txt +++ b/Userland/Applications/SystemMonitor/CMakeLists.txt @@ -4,8 +4,8 @@ serenity_component( TARGETS SystemMonitor Profiler ) -compile_gml(SystemMonitor.gml SystemMonitorGML.h system_monitor_gml) -compile_gml(ProcessWindow.gml ProcessWindowGML.h process_window_gml) +stringify_gml(SystemMonitor.gml SystemMonitorGML.h system_monitor_gml) +stringify_gml(ProcessWindow.gml ProcessWindowGML.h process_window_gml) set(SOURCES GraphWidget.cpp diff --git a/Userland/Applications/TerminalSettings/CMakeLists.txt b/Userland/Applications/TerminalSettings/CMakeLists.txt index 52d32ed00d..ddcab96e18 100644 --- a/Userland/Applications/TerminalSettings/CMakeLists.txt +++ b/Userland/Applications/TerminalSettings/CMakeLists.txt @@ -4,8 +4,8 @@ serenity_component( TARGETS TerminalSettings ) -compile_gml(TerminalSettingsMain.gml TerminalSettingsMainGML.h terminal_settings_main_gml) -compile_gml(TerminalSettingsView.gml TerminalSettingsViewGML.h terminal_settings_view_gml) +stringify_gml(TerminalSettingsMain.gml TerminalSettingsMainGML.h terminal_settings_main_gml) +stringify_gml(TerminalSettingsView.gml TerminalSettingsViewGML.h terminal_settings_view_gml) set(SOURCES TerminalSettingsWidget.cpp diff --git a/Userland/Applications/TextEditor/CMakeLists.txt b/Userland/Applications/TextEditor/CMakeLists.txt index fafddc577e..331f89673f 100644 --- a/Userland/Applications/TextEditor/CMakeLists.txt +++ b/Userland/Applications/TextEditor/CMakeLists.txt @@ -5,7 +5,7 @@ serenity_component( DEPENDS ImageDecoder RequestServer WebContent FileSystemAccessServer ) -compile_gml(TextEditorWindow.gml TextEditorWindowGML.h text_editor_window_gml) +stringify_gml(TextEditorWindow.gml TextEditorWindowGML.h text_editor_window_gml) set(SOURCES FileArgument.cpp diff --git a/Userland/Applications/ThemeEditor/CMakeLists.txt b/Userland/Applications/ThemeEditor/CMakeLists.txt index 7541f8a1fd..aa9c49ac62 100644 --- a/Userland/Applications/ThemeEditor/CMakeLists.txt +++ b/Userland/Applications/ThemeEditor/CMakeLists.txt @@ -3,13 +3,13 @@ serenity_component( TARGETS ThemeEditor ) -compile_gml(ThemeEditor.gml ThemeEditorGML.h theme_editor_gml) -compile_gml(AlignmentProperty.gml AlignmentPropertyGML.h alignment_property_gml) -compile_gml(ColorProperty.gml ColorPropertyGML.h color_property_gml) -compile_gml(FlagProperty.gml FlagPropertyGML.h flag_property_gml) -compile_gml(MetricProperty.gml MetricPropertyGML.h metric_property_gml) -compile_gml(PathProperty.gml PathPropertyGML.h path_property_gml) -compile_gml(Previews/WindowPreview.gml WindowPreviewGML.h window_preview_gml) +stringify_gml(ThemeEditor.gml ThemeEditorGML.h theme_editor_gml) +stringify_gml(AlignmentProperty.gml AlignmentPropertyGML.h alignment_property_gml) +stringify_gml(ColorProperty.gml ColorPropertyGML.h color_property_gml) +stringify_gml(FlagProperty.gml FlagPropertyGML.h flag_property_gml) +stringify_gml(MetricProperty.gml MetricPropertyGML.h metric_property_gml) +stringify_gml(PathProperty.gml PathPropertyGML.h path_property_gml) +stringify_gml(Previews/WindowPreview.gml WindowPreviewGML.h window_preview_gml) set(SOURCES MainWidget.cpp diff --git a/Userland/Applications/VideoPlayer/CMakeLists.txt b/Userland/Applications/VideoPlayer/CMakeLists.txt index 84baf49f57..c6a0b96c6f 100644 --- a/Userland/Applications/VideoPlayer/CMakeLists.txt +++ b/Userland/Applications/VideoPlayer/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( DEPENDS AudioServer ) -compile_gml(VideoPlayerWindow.gml VideoPlayerWindowGML.h videoplayer_window_gml) +stringify_gml(VideoPlayerWindow.gml VideoPlayerWindowGML.h videoplayer_window_gml) set(SOURCES main.cpp diff --git a/Userland/Applications/Welcome/CMakeLists.txt b/Userland/Applications/Welcome/CMakeLists.txt index a9cb95664d..1cb6b01bd1 100644 --- a/Userland/Applications/Welcome/CMakeLists.txt +++ b/Userland/Applications/Welcome/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( DEPENDS Help WebContent ) -compile_gml(WelcomeWindow.gml WelcomeWindowGML.h welcome_window_gml) +stringify_gml(WelcomeWindow.gml WelcomeWindowGML.h welcome_window_gml) set(SOURCES WelcomeWidget.cpp diff --git a/Userland/Demos/ModelGallery/CMakeLists.txt b/Userland/Demos/ModelGallery/CMakeLists.txt index f04e04d9c2..e7bb4b71ed 100644 --- a/Userland/Demos/ModelGallery/CMakeLists.txt +++ b/Userland/Demos/ModelGallery/CMakeLists.txt @@ -3,7 +3,7 @@ serenity_component( TARGETS ModelGallery ) -compile_gml(./BasicModelTab.gml BasicModelTabGML.h basic_model_tab_gml) +stringify_gml(./BasicModelTab.gml BasicModelTabGML.h basic_model_tab_gml) set(SOURCES main.cpp diff --git a/Userland/Demos/WidgetGallery/CMakeLists.txt b/Userland/Demos/WidgetGallery/CMakeLists.txt index dd2d3e0563..65bc16c40f 100644 --- a/Userland/Demos/WidgetGallery/CMakeLists.txt +++ b/Userland/Demos/WidgetGallery/CMakeLists.txt @@ -3,14 +3,14 @@ serenity_component( TARGETS WidgetGallery ) -compile_gml(./GalleryGML/Window.gml WindowGML.h window_gml) -compile_gml(./GalleryGML/BasicsTab.gml BasicsTabGML.h basics_tab_gml) -compile_gml(./GalleryGML/SlidersTab.gml SlidersTabGML.h sliders_tab_gml) -compile_gml(./GalleryGML/CursorsTab.gml CursorsTabGML.h cursors_tab_gml) -compile_gml(./GalleryGML/IconsTab.gml IconsTabGML.h icons_tab_gml) -compile_gml(./GalleryGML/WizardsTab.gml WizardsTabGML.h wizards_tab_gml) -compile_gml(DemoWizardPage1.gml DemoWizardPage1GML.h demo_wizard_page_1_gml) -compile_gml(DemoWizardPage2.gml DemoWizardPage2GML.h demo_wizard_page_2_gml) +stringify_gml(./GalleryGML/Window.gml WindowGML.h window_gml) +stringify_gml(./GalleryGML/BasicsTab.gml BasicsTabGML.h basics_tab_gml) +stringify_gml(./GalleryGML/SlidersTab.gml SlidersTabGML.h sliders_tab_gml) +stringify_gml(./GalleryGML/CursorsTab.gml CursorsTabGML.h cursors_tab_gml) +stringify_gml(./GalleryGML/IconsTab.gml IconsTabGML.h icons_tab_gml) +stringify_gml(./GalleryGML/WizardsTab.gml WizardsTabGML.h wizards_tab_gml) +stringify_gml(DemoWizardPage1.gml DemoWizardPage1GML.h demo_wizard_page_1_gml) +stringify_gml(DemoWizardPage2.gml DemoWizardPage2GML.h demo_wizard_page_2_gml) set(SOURCES main.cpp diff --git a/Userland/DevTools/GMLPlayground/CMakeLists.txt b/Userland/DevTools/GMLPlayground/CMakeLists.txt index 5ac8aec5ed..e31e5562e9 100644 --- a/Userland/DevTools/GMLPlayground/CMakeLists.txt +++ b/Userland/DevTools/GMLPlayground/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS GMLPlayground ) -compile_gml(GMLPlaygroundWindow.gml GMLPlaygroundWindowGML.h gml_playground_window_gml) +stringify_gml(GMLPlaygroundWindow.gml GMLPlaygroundWindowGML.h gml_playground_window_gml) set(SOURCES MainWidget.cpp diff --git a/Userland/DevTools/HackStudio/CMakeLists.txt b/Userland/DevTools/HackStudio/CMakeLists.txt index 92373ace9e..79fe47384a 100644 --- a/Userland/DevTools/HackStudio/CMakeLists.txt +++ b/Userland/DevTools/HackStudio/CMakeLists.txt @@ -8,8 +8,8 @@ serenity_component( add_subdirectory(LanguageServers) add_subdirectory(LanguageClients) -compile_gml(Dialogs/NewProjectDialog.gml Dialogs/NewProjectDialogGML.h new_project_dialog_gml) -compile_gml(Dialogs/Git/GitCommitDialog.gml Dialogs/Git/GitCommitDialogGML.h git_commit_dialog_gml) +stringify_gml(Dialogs/NewProjectDialog.gml Dialogs/NewProjectDialogGML.h new_project_dialog_gml) +stringify_gml(Dialogs/Git/GitCommitDialog.gml Dialogs/Git/GitCommitDialogGML.h git_commit_dialog_gml) set(SOURCES CodeDocument.cpp diff --git a/Userland/DevTools/SQLStudio/CMakeLists.txt b/Userland/DevTools/SQLStudio/CMakeLists.txt index 3b181de45f..8aeff8436b 100644 --- a/Userland/DevTools/SQLStudio/CMakeLists.txt +++ b/Userland/DevTools/SQLStudio/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS SQLStudio ) -compile_gml(SQLStudio.gml SQLStudioGML.h sql_studio_gml) +stringify_gml(SQLStudio.gml SQLStudioGML.h sql_studio_gml) set(SOURCES main.cpp diff --git a/Userland/Games/2048/CMakeLists.txt b/Userland/Games/2048/CMakeLists.txt index 3e5476c95d..f8efada264 100644 --- a/Userland/Games/2048/CMakeLists.txt +++ b/Userland/Games/2048/CMakeLists.txt @@ -4,8 +4,8 @@ serenity_component( TARGETS 2048 ) -compile_gml(GameSizeDialog.gml GameSizeDialogGML.h game_size_dialog_gml) -compile_gml(GameWindow.gml GameWindowGML.h game_window_gml) +stringify_gml(GameSizeDialog.gml GameSizeDialogGML.h game_size_dialog_gml) +stringify_gml(GameWindow.gml GameWindowGML.h game_window_gml) set(SOURCES BoardView.cpp diff --git a/Userland/Games/Flood/CMakeLists.txt b/Userland/Games/Flood/CMakeLists.txt index c6a939290c..7ca43fe1e6 100644 --- a/Userland/Games/Flood/CMakeLists.txt +++ b/Userland/Games/Flood/CMakeLists.txt @@ -4,8 +4,8 @@ serenity_component( TARGETS Flood ) -compile_gml(FloodWindow.gml FloodWindowGML.h flood_window_gml) -compile_gml(SettingsDialog.gml SettingsDialogGML.h settings_dialog_gml) +stringify_gml(FloodWindow.gml FloodWindowGML.h flood_window_gml) +stringify_gml(SettingsDialog.gml SettingsDialogGML.h settings_dialog_gml) set(SOURCES Board.cpp diff --git a/Userland/Games/GameOfLife/CMakeLists.txt b/Userland/Games/GameOfLife/CMakeLists.txt index 426305cb6d..9a5977dd2a 100644 --- a/Userland/Games/GameOfLife/CMakeLists.txt +++ b/Userland/Games/GameOfLife/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS GameOfLife ) -compile_gml(GameOfLife.gml GameOfLifeGML.h game_of_life_gml) +stringify_gml(GameOfLife.gml GameOfLifeGML.h game_of_life_gml) set(SOURCES main.cpp diff --git a/Userland/Games/Hearts/CMakeLists.txt b/Userland/Games/Hearts/CMakeLists.txt index 96d657d9e9..a7e8322988 100644 --- a/Userland/Games/Hearts/CMakeLists.txt +++ b/Userland/Games/Hearts/CMakeLists.txt @@ -5,7 +5,7 @@ serenity_component( TARGETS Hearts ) -compile_gml(Hearts.gml HeartsGML.h hearts_gml) +stringify_gml(Hearts.gml HeartsGML.h hearts_gml) set(SOURCES Game.cpp diff --git a/Userland/Games/MasterWord/CMakeLists.txt b/Userland/Games/MasterWord/CMakeLists.txt index 7a90f5824c..871948d2c8 100644 --- a/Userland/Games/MasterWord/CMakeLists.txt +++ b/Userland/Games/MasterWord/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS MasterWord ) -compile_gml(MasterWord.gml MasterWordGML.h master_word_gml) +stringify_gml(MasterWord.gml MasterWordGML.h master_word_gml) set(SOURCES main.cpp diff --git a/Userland/Games/Minesweeper/CMakeLists.txt b/Userland/Games/Minesweeper/CMakeLists.txt index 7e4df7babc..ad304f0b76 100644 --- a/Userland/Games/Minesweeper/CMakeLists.txt +++ b/Userland/Games/Minesweeper/CMakeLists.txt @@ -4,8 +4,8 @@ serenity_component( TARGETS Minesweeper ) -compile_gml(MinesweeperCustomGameWindow.gml MinesweeperCustomGameWindowGML.h minesweeper_custom_game_window_gml) -compile_gml(MinesweeperWindow.gml MinesweeperWindowGML.h minesweeper_window_gml) +stringify_gml(MinesweeperCustomGameWindow.gml MinesweeperCustomGameWindowGML.h minesweeper_custom_game_window_gml) +stringify_gml(MinesweeperWindow.gml MinesweeperWindowGML.h minesweeper_window_gml) set(SOURCES CustomGameDialog.cpp diff --git a/Userland/Games/Snake/CMakeLists.txt b/Userland/Games/Snake/CMakeLists.txt index b92db998fd..2e8acf1fc8 100644 --- a/Userland/Games/Snake/CMakeLists.txt +++ b/Userland/Games/Snake/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS Snake ) -compile_gml(Snake.gml SnakeGML.h snake_gml) +stringify_gml(Snake.gml SnakeGML.h snake_gml) set(SOURCES Game.cpp diff --git a/Userland/Games/Solitaire/CMakeLists.txt b/Userland/Games/Solitaire/CMakeLists.txt index dc4307266d..45776a02a5 100644 --- a/Userland/Games/Solitaire/CMakeLists.txt +++ b/Userland/Games/Solitaire/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS Solitaire ) -compile_gml(Solitaire.gml SolitaireGML.h solitaire_gml) +stringify_gml(Solitaire.gml SolitaireGML.h solitaire_gml) set(SOURCES Game.cpp diff --git a/Userland/Games/Spider/CMakeLists.txt b/Userland/Games/Spider/CMakeLists.txt index 2f266b8a5e..94b2e08175 100644 --- a/Userland/Games/Spider/CMakeLists.txt +++ b/Userland/Games/Spider/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS Spider ) -compile_gml(Spider.gml SpiderGML.h spider_gml) +stringify_gml(Spider.gml SpiderGML.h spider_gml) set(SOURCES Game.cpp diff --git a/Userland/Libraries/LibGUI/CMakeLists.txt b/Userland/Libraries/LibGUI/CMakeLists.txt index d5a78d0ecb..872bfe9402 100644 --- a/Userland/Libraries/LibGUI/CMakeLists.txt +++ b/Userland/Libraries/LibGUI/CMakeLists.txt @@ -1,9 +1,9 @@ -compile_gml(AboutDialog.gml AboutDialogGML.h about_dialog_gml) -compile_gml(EmojiInputDialog.gml EmojiInputDialogGML.h emoji_input_dialog_gml) -compile_gml(FontPickerDialog.gml FontPickerDialogGML.h font_picker_dialog_gml) -compile_gml(FilePickerDialog.gml FilePickerDialogGML.h file_picker_dialog_gml) -compile_gml(IncrementalSearchBanner.gml IncrementalSearchBannerGML.h incremental_search_banner_gml) -compile_gml(PasswordInputDialog.gml PasswordInputDialogGML.h password_input_dialog_gml) +stringify_gml(AboutDialog.gml AboutDialogGML.h about_dialog_gml) +stringify_gml(EmojiInputDialog.gml EmojiInputDialogGML.h emoji_input_dialog_gml) +stringify_gml(FontPickerDialog.gml FontPickerDialogGML.h font_picker_dialog_gml) +stringify_gml(FilePickerDialog.gml FilePickerDialogGML.h file_picker_dialog_gml) +stringify_gml(IncrementalSearchBanner.gml IncrementalSearchBannerGML.h incremental_search_banner_gml) +stringify_gml(PasswordInputDialog.gml PasswordInputDialogGML.h password_input_dialog_gml) set(SOURCES AboutDialog.cpp diff --git a/Userland/Services/LoginServer/CMakeLists.txt b/Userland/Services/LoginServer/CMakeLists.txt index afe3bbba04..6a00a763c2 100644 --- a/Userland/Services/LoginServer/CMakeLists.txt +++ b/Userland/Services/LoginServer/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS LoginServer ) -compile_gml(LoginWindow.gml LoginWindowGML.h login_window_gml) +stringify_gml(LoginWindow.gml LoginWindowGML.h login_window_gml) set(SOURCES LoginWindow.cpp