build: Rename another option

diff --git a/build-aux/flatpak/org.gtk.Demo4.json b/build-aux/flatpak/org.gtk.Demo4.json
index 457dfd64b86d5cf7789c0d30116b87f87dd3081e..5c75ece589ef8abe54616a31be0375b42fe49de3 100644 (file)
--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -187,7 +187,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

diff --git a/build-aux/flatpak/org.gtk.IconBrowser4.json b/build-aux/flatpak/org.gtk.IconBrowser4.json
index 00cdf9f110871733968613906717b408d3115896..b563dbb2850da11edcc8defd4505990124593261 100644 (file)
--- a/build-aux/flatpak/org.gtk.IconBrowser4.json
+++ b/build-aux/flatpak/org.gtk.IconBrowser4.json
@@ -116,7 +116,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json
index cdca2010ee02c496f2f64085adb4ea4885d5b91e..390da50cacaed79a6a7856f3c1e5c4eae6b30035 100644 (file)
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -116,7 +116,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

diff --git a/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json b/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
index bff6b20be3b0b1753b0dbc6a934286fbcd4c6fd4..ef60c66084f7dbdd1c75f820a8cd7694922519ae 100644 (file)
--- a/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
+++ b/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
@@ -116,7 +116,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

diff --git a/demos/meson.build b/demos/meson.build
index 91eb3c465c69d30d5bdfc05f8c10e56169e0606c..d4c04d2b8bc0ee14f1bb481ca37be447d37c5969 100644 (file)
--- a/demos/meson.build
+++ b/demos/meson.build
@@ -1,5 +1,5 @@
 gen_demo_header = find_program('../build-aux/meson/gen-demo-header.py')
-demo_profile = get_option('profile')
+demo_profile = get_option('demo-profile')
 
 demo_conf_h = declare_dependency(
   sources: custom_target('demo-header',

diff --git a/meson_options.txt b/meson_options.txt
index 1526a351bc4c0ee3f8b42976d064389239a966aa..f4399d39df6fadb287e1c1c6a9abbcfb5015a9a9 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -108,7 +108,7 @@ option('introspection',
 
 # Demos, examples and tests
 
-option('profile',
+option('demo-profile',
        type: 'combo',
        choices: [ 'default', 'devel' ],
        value: 'default',
@@ -119,6 +119,12 @@ option('build-demos',
        value: true,
        description : 'Build demo programs')
 
+option('profile',
+       type: 'combo',
+       choices: [ 'default', 'devel' ],
+       value: 'default',
+       deprecated: 'demo-profile')
+
 option('demos',
        type: 'boolean',
        value: true,