[gimp] meson: fix warnings of deprecated features.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] meson: fix warnings of deprecated features.
- Date: Tue, 30 Aug 2022 23:31:22 +0000 (UTC)
commit ca230cb770b764d79151b19ec8e208d76c654e1c
Author: Jehan <jehan girinstud io>
Date: Wed Aug 31 01:07:27 2022 +0200
meson: fix warnings of deprecated features.
Now that we bumped our meson requirement, meson is complaining about
several features now deprecated even in the minimum required meson
version:
s/meson.source_root/meson.project_source_root/ to fix:
> WARNING: Project targets '>=0.56.0' but uses feature deprecated since '0.56.0': meson.source_root. use
meson.project_source_root() or meson.global_source_root() instead.
s/meson.build_root/meson.project_build_root/ to fix:
> WARNING: Project targets '>=0.56.0' but uses feature deprecated since '0.56.0': meson.build_root. use
meson.project_build_root() or meson.global_build_root() instead.
Fixing using path() on xdg_email and python ExternalProgram variables:
> WARNING: Project targets '>=0.56.0' but uses feature deprecated since '0.55.0': ExternalProgram.path.
use ExternalProgram.full_path() instead
s/get_pkgconfig_variable *(\([^)]*\))/get_variable(pkgconfig: \1)/ to
fix:
> WARNING: Project targets '>=0.56.0' but uses feature deprecated since '0.56.0':
dependency.get_pkgconfig_variable. use dependency.get_variable(pkgconfig : ...) instead
app/config/meson.build | 2 +-
app/core/meson.build | 2 +-
app/dialogs/meson.build | 10 +++++-----
app/display/meson.build | 2 +-
app/gegl/meson.build | 2 +-
app/meson.build | 4 ++--
app/operations/meson.build | 2 +-
app/paint/meson.build | 2 +-
app/plug-in/meson.build | 2 +-
app/tests/meson.build | 6 +++---
app/text/meson.build | 2 +-
app/tools/meson.build | 2 +-
app/widgets/meson.build | 2 +-
build/windows/installer/lang/meson.build | 2 +-
desktop/meson.build | 2 +-
devel-docs/g-ir-docs/meson.build | 8 ++++----
devel-docs/reference/gimp-ui/meson.build | 2 +-
extensions/goat-exercises/meson.build | 2 +-
libgimp/meson.build | 2 +-
libgimpbase/meson.build | 4 ++--
libgimpconfig/meson.build | 2 +-
libgimpwidgets/meson.build | 2 +-
meson.build | 22 +++++++++++-----------
pdb/meson.build | 16 ++++++++--------
plug-ins/common/meson.build | 2 +-
plug-ins/file-bmp/meson.build | 2 +-
plug-ins/file-dds/meson.build | 2 +-
plug-ins/file-exr/meson.build | 2 +-
plug-ins/file-faxg3/meson.build | 2 +-
plug-ins/file-fits/meson.build | 2 +-
plug-ins/file-fli/meson.build | 2 +-
plug-ins/file-ico/meson.build | 2 +-
plug-ins/file-jpeg/meson.build | 2 +-
plug-ins/file-psd/meson.build | 2 +-
plug-ins/file-raw/meson.build | 2 +-
plug-ins/file-sgi/meson.build | 2 +-
plug-ins/file-tiff/meson.build | 2 +-
plug-ins/file-webp/meson.build | 2 +-
plug-ins/flame/meson.build | 2 +-
plug-ins/fractal-explorer/meson.build | 2 +-
plug-ins/gfig/meson.build | 2 +-
plug-ins/gimpressionist/meson.build | 2 +-
plug-ins/gradient-flare/meson.build | 2 +-
plug-ins/help-browser/meson.build | 2 +-
plug-ins/help/meson.build | 2 +-
plug-ins/ifs-compose/meson.build | 2 +-
plug-ins/imagemap/meson.build | 2 +-
plug-ins/lighting/meson.build | 2 +-
plug-ins/map-object/meson.build | 2 +-
plug-ins/metadata/meson.build | 4 ++--
plug-ins/pagecurl/meson.build | 2 +-
plug-ins/print/meson.build | 2 +-
plug-ins/python/meson.build | 2 +-
plug-ins/script-fu/interpreter/meson.build | 2 +-
plug-ins/script-fu/meson.build | 2 +-
plug-ins/script-fu/server/meson.build | 2 +-
plug-ins/selection-to-path/meson.build | 2 +-
plug-ins/twain/meson.build | 2 +-
po-tips/meson.build | 2 +-
po-windows-installer/meson.build | 2 +-
60 files changed, 89 insertions(+), 89 deletions(-)
---
diff --git a/app/config/meson.build b/app/config/meson.build
index b1b98edb33..a739ad6ce0 100644
--- a/app/config/meson.build
+++ b/app/config/meson.build
@@ -7,7 +7,7 @@ stamp_config_enums = custom_target('stamp-config-enums.h',
output: [ 'stamp-config-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'config-',
'#include <gio/gio.h>\n' +
diff --git a/app/core/meson.build b/app/core/meson.build
index cc07adc88c..6a8313025a 100644
--- a/app/core/meson.build
+++ b/app/core/meson.build
@@ -7,7 +7,7 @@ stamp_core_enums = custom_target('stamp-core-enums.h',
output: [ 'stamp-core-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'core-',
'#include <gio/gio.h>\n' +
diff --git a/app/dialogs/meson.build b/app/dialogs/meson.build
index 935621e2ec..545da8e337 100644
--- a/app/dialogs/meson.build
+++ b/app/dialogs/meson.build
@@ -1,12 +1,12 @@
welcome_dialog_data_h = custom_target('welcome-dialog-data-h',
- input : [meson.source_root() / 'tools/generate-welcome-dialog-data.py',
- meson.source_root() /
'desktop/org.gimp.GIMP.appdata.xml.in.in'],
+ input : [meson.project_source_root() /
'tools/generate-welcome-dialog-data.py',
+ meson.project_source_root() /
'desktop/org.gimp.GIMP.appdata.xml.in.in'],
output : ['welcome-dialog-data.h'],
command : ['python3', '@INPUT0@', gimp_version, '--header'],
capture: true)
welcome_dialog_data_c = custom_target('welcome-dialog-data-c',
- input : [meson.source_root() / 'tools/generate-welcome-dialog-data.py',
- meson.source_root() /
'desktop/org.gimp.GIMP.appdata.xml.in.in'],
+ input : [meson.project_source_root() /
'tools/generate-welcome-dialog-data.py',
+ meson.project_source_root() /
'desktop/org.gimp.GIMP.appdata.xml.in.in'],
output : ['welcome-dialog-data.c'],
command : ['python3', '@INPUT0@', gimp_version],
capture: true)
@@ -65,7 +65,7 @@ libappdialogs_sources = [
# Auto-generated sources
libappdialogs_sources += [
custom_target('authors.h',
- input : [ 'authors.xsl', meson.source_root() / 'authors.xml' ],
+ input : [ 'authors.xsl', meson.project_source_root() / 'authors.xml' ],
output: [ 'authors.h' ],
command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT0@', '@INPUT1@' ],
)
diff --git a/app/display/meson.build b/app/display/meson.build
index 43db1fd13e..3ca11a6a83 100644
--- a/app/display/meson.build
+++ b/app/display/meson.build
@@ -7,7 +7,7 @@ stamp_display_enums = custom_target('stamp-display-enums.h',
output: [ 'stamp-display-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'display-',
'#include <gio/gio.h>\n' +
diff --git a/app/gegl/meson.build b/app/gegl/meson.build
index b033eca63d..9f12dbdfec 100644
--- a/app/gegl/meson.build
+++ b/app/gegl/meson.build
@@ -7,7 +7,7 @@ stamp_gegl_enums = custom_target('stamp-gimp-gegl-enums.h',
output: [ 'stamp-gimp-gegl-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'gimp-gegl-',
'#include <gio/gio.h>\n' +
diff --git a/app/meson.build b/app/meson.build
index 4d7935e9f4..399bf7e1d8 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -153,7 +153,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(console_rc_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(console_rc_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -171,7 +171,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(gui_rc_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(gui_rc_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/app/operations/meson.build b/app/operations/meson.build
index 39765b6bce..14f210b989 100644
--- a/app/operations/meson.build
+++ b/app/operations/meson.build
@@ -7,7 +7,7 @@ stamp_operations_enums = custom_target('stamp-operations-enums.h',
output: [ 'stamp-operations-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'operations-',
'#include <gio/gio.h>\n' +
diff --git a/app/paint/meson.build b/app/paint/meson.build
index 56113c09c3..fc5328fa86 100644
--- a/app/paint/meson.build
+++ b/app/paint/meson.build
@@ -7,7 +7,7 @@ stamp_paint_enums = custom_target('stamp-paint-enums.h',
output: [ 'stamp-paint-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'paint-',
'#include <gio/gio.h>\n' +
diff --git a/app/plug-in/meson.build b/app/plug-in/meson.build
index 95e4c2e9b0..49318b44de 100644
--- a/app/plug-in/meson.build
+++ b/app/plug-in/meson.build
@@ -7,7 +7,7 @@ stamp_plug_in_enums = custom_target('stamp-plug-in-enums.h',
output: [ 'stamp-plug-in-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'plug-in-',
'#include <gio/gio.h>\n' +
diff --git a/app/tests/meson.build b/app/tests/meson.build
index ca9112514b..9559d86fc7 100644
--- a/app/tests/meson.build
+++ b/app/tests/meson.build
@@ -59,9 +59,9 @@ foreach test_name : app_tests
test(test_name,
test_exe,
env: [
- 'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.source_root(),
- 'GIMP_TESTING_ABS_TOP_BUILDDIR='+ meson.build_root(),
- 'GIMP_TESTING_PLUGINDIRS=' + meson.build_root()/'plug-ins'/'common',
+ 'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.project_source_root(),
+ 'GIMP_TESTING_ABS_TOP_BUILDDIR='+ meson.project_build_root(),
+ 'GIMP_TESTING_PLUGINDIRS=' + meson.project_build_root()/'plug-ins'/'common',
'GIMP_TESTING_PLUGINDIRS_BASENAME_IGNORES=mkgen.pl',
'UI_TEST=yes',
],
diff --git a/app/text/meson.build b/app/text/meson.build
index 792b00bb4f..98bd6c548c 100644
--- a/app/text/meson.build
+++ b/app/text/meson.build
@@ -7,7 +7,7 @@ stamp_text_enums = custom_target('stamp-text-enums.h',
output: [ 'stamp-text-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'text-',
'#include <gio/gio.h>\n' +
diff --git a/app/tools/meson.build b/app/tools/meson.build
index 6a5a278488..58366b7485 100644
--- a/app/tools/meson.build
+++ b/app/tools/meson.build
@@ -7,7 +7,7 @@ stamp_tools_enums = custom_target('stamp-tools-enums.h',
output: [ 'stamp-tools-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'tools-',
'#include <gio/gio.h>\n' +
diff --git a/app/widgets/meson.build b/app/widgets/meson.build
index 0debd83c91..b8071376d2 100644
--- a/app/widgets/meson.build
+++ b/app/widgets/meson.build
@@ -7,7 +7,7 @@ stamp_widgets_enums = custom_target('stamp-widgets-enums.h',
output: [ 'stamp-widgets-enums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'widgets-',
'#include <gtk/gtk.h>\n' +
diff --git a/build/windows/installer/lang/meson.build b/build/windows/installer/lang/meson.build
index 6488ecfcb7..f3474a54f4 100644
--- a/build/windows/installer/lang/meson.build
+++ b/build/windows/installer/lang/meson.build
@@ -126,6 +126,6 @@ endforeach
test('windows-installer-langs',
find_program('test-installer-langs.sh'),
env: [
- 'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.source_root(),
+ 'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.project_source_root(),
],
suite: 'build')
diff --git a/desktop/meson.build b/desktop/meson.build
index eeabe804fa..fa267fa932 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -69,7 +69,7 @@ if appstreamcli.found()
appstreamcli,
args: [ 'validate', appdatafile ],
env: [
- 'GIMP_TESTING_ABS_TOP_BUILDDIR=' + meson.build_root(),
+ 'GIMP_TESTING_ABS_TOP_BUILDDIR=' + meson.project_build_root(),
],
suite: 'desktop',
)
diff --git a/devel-docs/g-ir-docs/meson.build b/devel-docs/g-ir-docs/meson.build
index 25fb73f0bd..374b94143f 100644
--- a/devel-docs/g-ir-docs/meson.build
+++ b/devel-docs/g-ir-docs/meson.build
@@ -36,10 +36,10 @@ foreach lang : [ 'python', 'gjs' ]
command: [
gir_doc_tool,
'-I', prefix / 'share/gir-1.0/',
- '-I', meson.build_root() / 'libgimp',
+ '-I', meson.project_build_root() / 'libgimp',
'--language=' + lang,
'-o', '@OUTDIR@' + '/pages/' + lang + '/Gimp-' + gimp_api_version,
- meson.build_root() / '@INPUT@'
+ meson.project_build_root() / '@INPUT@'
],
build_by_default: true)
@@ -101,10 +101,10 @@ foreach lang : [ 'python', 'gjs' ]
command: [
gir_doc_tool,
'-I', prefix / 'share/gir-1.0/',
- '-I', meson.build_root() / 'libgimp',
+ '-I', meson.project_build_root() / 'libgimp',
'--language=' + lang,
'-o', '@OUTDIR@' + '/pages/' + lang + '/GimpUi-' + gimp_api_version,
- meson.build_root() / '@INPUT@'
+ meson.project_build_root() / '@INPUT@'
],
build_by_default: true)
diff --git a/devel-docs/reference/gimp-ui/meson.build b/devel-docs/reference/gimp-ui/meson.build
index da1e32f1ea..dcec4be923 100644
--- a/devel-docs/reference/gimp-ui/meson.build
+++ b/devel-docs/reference/gimp-ui/meson.build
@@ -24,7 +24,7 @@ gimp_ui_docs = custom_target('gimp-ui-docs',
'--output-dir=@OUTPUT@',
'--no-namespace-dir',
'--content-dir=@0@'.format(meson.current_source_dir()),
- '--add-include-path=@0@'.format(meson.build_root() / 'libgimp'),
+ '--add-include-path=@0@'.format(meson.project_build_root() / 'libgimp'),
'@INPUT@',
],
depends: libgimp_gir[0],
diff --git a/extensions/goat-exercises/meson.build b/extensions/goat-exercises/meson.build
index 09223625af..7a916d5dac 100644
--- a/extensions/goat-exercises/meson.build
+++ b/extensions/goat-exercises/meson.build
@@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plug_in_name + '-c.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plug_in_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/libgimp/meson.build b/libgimp/meson.build
index 0001e82ccd..ca5fbff262 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -552,7 +552,7 @@ if have_python and not platform_windows and not platform_osx
],
output: [ 'check-def-files', ],
command: [
- python, meson.source_root() / 'tools' / 'defcheck.py', meson.source_root(),
+ python, meson.project_source_root() / 'tools' / 'defcheck.py', meson.project_source_root(),
],
build_by_default: true,
)
diff --git a/libgimpbase/meson.build b/libgimpbase/meson.build
index 012e845234..5f90556d72 100644
--- a/libgimpbase/meson.build
+++ b/libgimpbase/meson.build
@@ -17,7 +17,7 @@ stamp_base_enums = custom_target('stamp-gimpbaseenums.h',
output: [ 'stamp-gimpbaseenums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'gimpbase',
'#include <glib-object.h>\n' +
@@ -39,7 +39,7 @@ stamp_compat_enums = custom_target('stamp-gimpcompatenums.h',
output: [ 'stamp-gimpcompatenums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(), meson.current_build_dir(),
+ meson.project_source_root(), meson.current_source_dir(), meson.current_build_dir(),
'gimpcompat',
'#include <glib-object.h>\n' +
'#include "gimpbasetypes.h"\n',
diff --git a/libgimpconfig/meson.build b/libgimpconfig/meson.build
index db6a83eacd..4199d638c3 100644
--- a/libgimpconfig/meson.build
+++ b/libgimpconfig/meson.build
@@ -8,7 +8,7 @@ stamp_config_enums = custom_target('stamp-gimpconfigenums.h',
output: [ 'stamp-gimpconfigenums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'gimpconfig',
'#include <gio/gio.h>\n' +
diff --git a/libgimpwidgets/meson.build b/libgimpwidgets/meson.build
index 9364d673a5..ee86bce8e2 100644
--- a/libgimpwidgets/meson.build
+++ b/libgimpwidgets/meson.build
@@ -7,7 +7,7 @@ stamp_widgets_enums = custom_target('stamp-gimpwidgetsenums.h',
output: [ 'stamp-gimpwidgetsenums.h', ],
command: [
mkenums_wrap, perl,
- meson.source_root(), meson.current_source_dir(),
+ meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'gimpwidgets',
'#include <gio/gio.h>\n' +
diff --git a/meson.build b/meson.build
index a1b86ee0a7..5be4c6644e 100644
--- a/meson.build
+++ b/meson.build
@@ -385,7 +385,7 @@ if relocatable_bundle
mypaint_brushes_dir = '${gimp_installation_dir}'\
/'share'/'mypaint-data'/'1.0'/'brushes'
else
- mypaint_brushes_dir = mypaint_brushes.get_pkgconfig_variable('brushesdir')
+ mypaint_brushes_dir = mypaint_brushes.get_variable(pkgconfig: 'brushesdir')
endif
conf.set_quoted('MYPAINT_BRUSHES_DIR', mypaint_brushes_dir)
@@ -576,7 +576,7 @@ detailed_backtraces = (
################################################################################
# Check for x11 support
-x11_target = gtk3.get_pkgconfig_variable('targets').contains('x11')
+x11_target = gtk3.get_variable(pkgconfig: 'targets').contains('x11')
x11 = x11_target ? dependency('x11') : no_dep
xmu = x11_target ? dependency('xmu') : no_dep
@@ -733,8 +733,8 @@ have_heif = libheif.found()
libheif_warning=''
if have_heif
have_heif = true
- can_import_heic = (libheif.get_pkgconfig_variable('builtin_h265_decoder') == 'yes')
- can_export_heic = (libheif.get_pkgconfig_variable('builtin_h265_encoder') == 'yes')
+ can_import_heic = (libheif.get_variable(pkgconfig: 'builtin_h265_decoder') == 'yes')
+ can_export_heic = (libheif.get_variable(pkgconfig: 'builtin_h265_encoder') == 'yes')
if can_import_heic
MIMEtypes += [
'image/heif',
@@ -742,8 +742,8 @@ if have_heif
]
endif
- can_import_avif = (libheif.get_pkgconfig_variable('builtin_avif_decoder') == 'yes')
- can_export_avif = (libheif.get_pkgconfig_variable('builtin_avif_encoder') == 'yes')
+ can_import_avif = (libheif.get_variable(pkgconfig: 'builtin_avif_decoder') == 'yes')
+ can_export_avif = (libheif.get_variable(pkgconfig: 'builtin_avif_encoder') == 'yes')
if can_import_avif
MIMEtypes += [
'image/avif'
@@ -907,7 +907,7 @@ else
xdg_email_path = 'xdg-email'
xdg_email = find_program(xdg_email_path, required: false)
if xdg_email.found()
- xdg_email_path = xdg_email.path()
+ xdg_email_path = xdg_email.full_path()
else
mail_warning = 'Xdg-email not found, but required at runtime for email sending.'
warning(mail_warning)
@@ -923,7 +923,7 @@ endif
isocodes = dependency('iso-codes', required: false)
if isocodes.found()
- isocodes_prefix = isocodes.get_pkgconfig_variable('prefix')
+ isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix')
isocodes_location = isocodes_prefix / get_option('datadir') / 'xml' / 'iso-codes'
isocodes_localedir= isocodes_prefix / get_option('datadir') / 'locale'
endif
@@ -1020,7 +1020,7 @@ endif
# Check for GTK Mac Integration
-if platform_osx and (gtk3.get_pkgconfig_variable('targets').contains('quartz'))
+if platform_osx and (gtk3.get_variable(pkgconfig: 'targets').contains('quartz'))
# Support for homebrew version of gtk-mac-integration
gtk3_macos = dependency('gtk-mac-integration-gtk3', version: '>=3.0.1', required: false)
if not gtk3_macos.found()
@@ -1637,7 +1637,7 @@ custom_target('Changelog',
output: [ 'Changelog', ],
command: [
generate_changelog,
- meson.source_root(),
+ meson.project_source_root(),
'@OUTPUT@'
],
build_by_default: false,
@@ -1645,7 +1645,7 @@ custom_target('Changelog',
meson.add_dist_script('meson_dist_script.sh',
generate_version_h ? gitversion_h.full_path() : gitversion_h,
- meson.source_root(), meson.build_root())
+ meson.project_source_root(), meson.project_build_root())
################################################################################
diff --git a/pdb/meson.build b/pdb/meson.build
index 1df5897bfd..d6b82fe64f 100644
--- a/pdb/meson.build
+++ b/pdb/meson.build
@@ -63,11 +63,11 @@ endforeach
enum_headers = [
- meson.source_root() + '/libgimpbase/gimpbaseenums.h',
- meson.source_root() + '/libgimpconfig/gimpconfigenums.h',
- meson.source_root() + '/app/operations/operations-enums.h',
- meson.source_root() + '/app/core/core-enums.h',
- meson.source_root() + '/app/paint/paint-enums.h'
+ meson.project_source_root() + '/libgimpbase/gimpbaseenums.h',
+ meson.project_source_root() + '/libgimpconfig/gimpconfigenums.h',
+ meson.project_source_root() + '/app/operations/operations-enums.h',
+ meson.project_source_root() + '/app/core/core-enums.h',
+ meson.project_source_root() + '/app/paint/paint-enums.h'
]
# Perl environment
@@ -79,8 +79,8 @@ perl_env = [
'PDBGEN_GROUPS=' + (pdbgen_groups ? '1' : '0'),
'rootme=' + perlbindir,
'srcdir=' + perlsrcdir,
- 'destdir=' + meson.build_root(),
- 'builddir=' + meson.build_root(),
+ 'destdir=' + meson.project_build_root(),
+ 'builddir=' + meson.project_build_root(),
]
perl_opts = [
perl,
@@ -183,7 +183,7 @@ else
],
output: [ 'stamp-pdbgen.h', ],
command: [
- env, perl_env, pdbgen_run, perl, meson.source_root(), meson.build_root()
+ env, perl_env, pdbgen_run, perl, meson.project_source_root(), meson.project_build_root()
],
)
diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build
index 88b5071def..07a9e25899 100644
--- a/plug-ins/common/meson.build
+++ b/plug-ins/common/meson.build
@@ -189,7 +189,7 @@ foreach plugin : common_plugins_list
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-bmp/meson.build b/plug-ins/file-bmp/meson.build
index d1ede2ca25..349e998a5c 100644
--- a/plug-ins/file-bmp/meson.build
+++ b/plug-ins/file-bmp/meson.build
@@ -12,7 +12,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-dds/meson.build b/plug-ins/file-dds/meson.build
index da8b2fa67b..b8a47ee88f 100644
--- a/plug-ins/file-dds/meson.build
+++ b/plug-ins/file-dds/meson.build
@@ -16,7 +16,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-exr/meson.build b/plug-ins/file-exr/meson.build
index 7ff9237797..f650496264 100644
--- a/plug-ins/file-exr/meson.build
+++ b/plug-ins/file-exr/meson.build
@@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-faxg3/meson.build b/plug-ins/file-faxg3/meson.build
index 4642edbd74..b21d30a905 100644
--- a/plug-ins/file-faxg3/meson.build
+++ b/plug-ins/file-faxg3/meson.build
@@ -11,7 +11,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-fits/meson.build b/plug-ins/file-fits/meson.build
index 95ba044e53..239e674edc 100644
--- a/plug-ins/file-fits/meson.build
+++ b/plug-ins/file-fits/meson.build
@@ -11,7 +11,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-fli/meson.build b/plug-ins/file-fli/meson.build
index ed4b3d8697..9ccc8ae1c5 100644
--- a/plug-ins/file-fli/meson.build
+++ b/plug-ins/file-fli/meson.build
@@ -11,7 +11,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-ico/meson.build b/plug-ins/file-ico/meson.build
index b657e16b38..fea223e832 100644
--- a/plug-ins/file-ico/meson.build
+++ b/plug-ins/file-ico/meson.build
@@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-jpeg/meson.build b/plug-ins/file-jpeg/meson.build
index 7ba13bc082..72bb0567da 100644
--- a/plug-ins/file-jpeg/meson.build
+++ b/plug-ins/file-jpeg/meson.build
@@ -15,7 +15,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-psd/meson.build b/plug-ins/file-psd/meson.build
index 9e13114c1b..6b0511f2f8 100644
--- a/plug-ins/file-psd/meson.build
+++ b/plug-ins/file-psd/meson.build
@@ -16,7 +16,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-raw/meson.build b/plug-ins/file-raw/meson.build
index a573e9fb22..ce3667f4de 100644
--- a/plug-ins/file-raw/meson.build
+++ b/plug-ins/file-raw/meson.build
@@ -23,7 +23,7 @@ foreach plugin_name : file_raw_exes
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-sgi/meson.build b/plug-ins/file-sgi/meson.build
index 954923654e..762ddad7b9 100644
--- a/plug-ins/file-sgi/meson.build
+++ b/plug-ins/file-sgi/meson.build
@@ -11,7 +11,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-tiff/meson.build b/plug-ins/file-tiff/meson.build
index c3d3c51b5a..a35d5cf8d4 100644
--- a/plug-ins/file-tiff/meson.build
+++ b/plug-ins/file-tiff/meson.build
@@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/file-webp/meson.build b/plug-ins/file-webp/meson.build
index 990e0d7e06..8ad12b4e07 100644
--- a/plug-ins/file-webp/meson.build
+++ b/plug-ins/file-webp/meson.build
@@ -15,7 +15,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/flame/meson.build b/plug-ins/flame/meson.build
index 6dcd6ea676..14ef577ee4 100644
--- a/plug-ins/flame/meson.build
+++ b/plug-ins/flame/meson.build
@@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/fractal-explorer/meson.build b/plug-ins/fractal-explorer/meson.build
index 865d9ec288..fca1b283a1 100644
--- a/plug-ins/fractal-explorer/meson.build
+++ b/plug-ins/fractal-explorer/meson.build
@@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/gfig/meson.build b/plug-ins/gfig/meson.build
index a77f321018..30f5c1d4b5 100644
--- a/plug-ins/gfig/meson.build
+++ b/plug-ins/gfig/meson.build
@@ -29,7 +29,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/gimpressionist/meson.build b/plug-ins/gimpressionist/meson.build
index 8385ebdd91..1a5f4d1c9c 100644
--- a/plug-ins/gimpressionist/meson.build
+++ b/plug-ins/gimpressionist/meson.build
@@ -31,7 +31,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/gradient-flare/meson.build b/plug-ins/gradient-flare/meson.build
index b20f572667..1c218c38d1 100644
--- a/plug-ins/gradient-flare/meson.build
+++ b/plug-ins/gradient-flare/meson.build
@@ -12,7 +12,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/help-browser/meson.build b/plug-ins/help-browser/meson.build
index c414156980..068c003d54 100644
--- a/plug-ins/help-browser/meson.build
+++ b/plug-ins/help-browser/meson.build
@@ -14,7 +14,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/help/meson.build b/plug-ins/help/meson.build
index 1f07710935..e1625f5956 100644
--- a/plug-ins/help/meson.build
+++ b/plug-ins/help/meson.build
@@ -15,7 +15,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/ifs-compose/meson.build b/plug-ins/ifs-compose/meson.build
index 2a74c6b362..71d399e572 100644
--- a/plug-ins/ifs-compose/meson.build
+++ b/plug-ins/ifs-compose/meson.build
@@ -12,7 +12,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/imagemap/meson.build b/plug-ins/imagemap/meson.build
index 7b8868ac96..29f2d9605a 100644
--- a/plug-ins/imagemap/meson.build
+++ b/plug-ins/imagemap/meson.build
@@ -75,7 +75,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/lighting/meson.build b/plug-ins/lighting/meson.build
index 2a4d756786..1c7cfcb4bd 100644
--- a/plug-ins/lighting/meson.build
+++ b/plug-ins/lighting/meson.build
@@ -19,7 +19,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/map-object/meson.build b/plug-ins/map-object/meson.build
index a1b79b2eb6..104483828d 100644
--- a/plug-ins/map-object/meson.build
+++ b/plug-ins/map-object/meson.build
@@ -18,7 +18,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/metadata/meson.build b/plug-ins/metadata/meson.build
index b4d6cbf8a5..4247101282 100644
--- a/plug-ins/metadata/meson.build
+++ b/plug-ins/metadata/meson.build
@@ -19,7 +19,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
@@ -57,7 +57,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/pagecurl/meson.build b/plug-ins/pagecurl/meson.build
index f2df4fc605..a14e093498 100644
--- a/plug-ins/pagecurl/meson.build
+++ b/plug-ins/pagecurl/meson.build
@@ -43,7 +43,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/print/meson.build b/plug-ins/print/meson.build
index 9e18589313..1f2396e897 100644
--- a/plug-ins/print/meson.build
+++ b/plug-ins/print/meson.build
@@ -19,7 +19,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/python/meson.build b/plug-ins/python/meson.build
index 656eb4d1ee..83fd34908c 100644
--- a/plug-ins/python/meson.build
+++ b/plug-ins/python/meson.build
@@ -28,7 +28,7 @@ endforeach
if python.found()
python_config = configuration_data()
- python_config.set('PYTHON_PATH', python.path())
+ python_config.set('PYTHON_PATH', python.full_path())
configure_file(
input : 'pygimp.interp.in',
diff --git a/plug-ins/script-fu/interpreter/meson.build b/plug-ins/script-fu/interpreter/meson.build
index c57e61100c..9d602c3cc1 100644
--- a/plug-ins/script-fu/interpreter/meson.build
+++ b/plug-ins/script-fu/interpreter/meson.build
@@ -14,7 +14,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/script-fu/meson.build b/plug-ins/script-fu/meson.build
index c19d040f03..6f8036ba2f 100644
--- a/plug-ins/script-fu/meson.build
+++ b/plug-ins/script-fu/meson.build
@@ -33,7 +33,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/script-fu/server/meson.build b/plug-ins/script-fu/server/meson.build
index 07f5e17cae..b7303fd996 100644
--- a/plug-ins/script-fu/server/meson.build
+++ b/plug-ins/script-fu/server/meson.build
@@ -14,7 +14,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/selection-to-path/meson.build b/plug-ins/selection-to-path/meson.build
index 1d008e9547..697d680ae7 100644
--- a/plug-ins/selection-to-path/meson.build
+++ b/plug-ins/selection-to-path/meson.build
@@ -18,7 +18,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/plug-ins/twain/meson.build b/plug-ins/twain/meson.build
index bf75f25457..ad233e091b 100644
--- a/plug-ins/twain/meson.build
+++ b/plug-ins/twain/meson.build
@@ -16,7 +16,7 @@ plugin_sources += windows.compile_resources(
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
- '--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
+ '--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
],
include_directories: [
rootInclude, appInclude,
diff --git a/po-tips/meson.build b/po-tips/meson.build
index c9a9e30bef..e0e1fd34ef 100644
--- a/po-tips/meson.build
+++ b/po-tips/meson.build
@@ -2,5 +2,5 @@ potips_dir = meson.current_source_dir()
i18n.gettext(gettext_package + '-tips',
preset: 'glib',
install: false,
- data_dirs: meson.source_root() / 'data' / 'tips',
+ data_dirs: meson.project_source_root() / 'data' / 'tips',
)
diff --git a/po-windows-installer/meson.build b/po-windows-installer/meson.build
index 1a88b0c03a..d12e1626c7 100644
--- a/po-windows-installer/meson.build
+++ b/po-windows-installer/meson.build
@@ -1,3 +1,3 @@
po_windows_installer_dir = meson.current_source_dir()
i18n.gettext(gettext_package + '-windows-installer', preset: 'glib', install: false,
- data_dirs: meson.source_root() / 'build' / 'windows' / 'installer' / 'lang')
+ data_dirs: meson.project_source_root() / 'build' / 'windows' / 'installer' / 'lang')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
