This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enventor.
View the commit online.
commit e4044d81486abf46a390cd1f89aa6b533bb2238f
Author: Vincent Torri <[email protected]>
AuthorDate: Mon Sep 29 10:53:26 2025 +0200
update meson code
---
data/templates/meson.build | 4 ++--
meson.build | 6 +++---
pc/meson.build | 4 ++--
po/meson.build | 2 +-
src/bin/meson.build | 4 ++--
src/lib/meson.build | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/data/templates/meson.build b/data/templates/meson.build
index 0965438..0ad161f 100644
--- a/data/templates/meson.build
+++ b/data/templates/meson.build
@@ -39,8 +39,8 @@ foreach edc_file : edc_template_files
command : edje_cc_exe +
[
'-beta',
- '-sd', join_paths(meson.source_root(), 'data/sounds'),
- '-id', join_paths(meson.source_root(), 'data/images'),
+ '-sd', join_paths(meson.project_source_root(), 'data/sounds'),
+ '-id', join_paths(meson.project_source_root(), 'data/images'),
'@INPUT@', '@OUTPUT@'
],
install : true,
diff --git a/meson.build b/meson.build
index 0144b0c..2ba8e48 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,11 @@
project('enventor', 'c',
- version : '1.0.99',
- meson_version : '>= 0.53',
default_options : [
'warning_level=2',
'buildtype=debugoptimized',
'c_std=c99'
- ]
+ ],
+ meson_version : '>= 0.60',
+ version : '1.0.99',
)
v_array = meson.project_version().split('.')
diff --git a/pc/meson.build b/pc/meson.build
index 52f14cf..b3f4f92 100644
--- a/pc/meson.build
+++ b/pc/meson.build
@@ -1,7 +1,7 @@
pkgconf = configuration_data()
-pkgconf.set('prefix', get_option('prefix'))
+pkgconf.set('prefix', dir_prefix)
pkgconf.set('exec_prefix', '${prefix}')
pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
@@ -13,7 +13,7 @@ pkgconf.set('requirement_enventor', requirement_enventor_pc)
pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
configure_file(
- input : join_paths(meson.source_root(), 'pc/enventor.pc.in'),
+ input : join_paths(meson.current_source_dir(), 'enventor.pc.in'),
output : 'enventor.pc',
configuration : pkgconf,
install_dir : pkg_install_dir
diff --git a/po/meson.build b/po/meson.build
index 1fe48cf..33b8039 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -3,7 +3,7 @@ if get_option('nls')
i18n = import('i18n')
i18n.gettext(meson.project_name(),
args: [
- '--directory=' + meson.source_root(),
+ '--directory=' + meson.project_source_root(),
'--keyword=_',
'--keyword=d_:1',
'--keyword=P_:1,2',
diff --git a/src/bin/meson.build b/src/bin/meson.build
index 6005576..c9ea659 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -27,8 +27,8 @@ enventor_bin_src = [
enventor_bin = executable('enventor', enventor_bin_src,
c_args : [ enventor_cargs,
'-DHAVE_CONFIG_H',
- '-I' + join_paths(meson.source_root(), 'src/include') ],
- dependencies : [ enventor, dependency('elementary', version : efl_req) ],
+ '-I' + join_paths(meson.project_source_root(), 'src/include') ],
+ dependencies : [ enventor_dep, dependency('elementary', version : efl_req) ],
include_directories : config_dir,
install : true
)
diff --git a/src/lib/meson.build b/src/lib/meson.build
index fe8a18a..4b81aa1 100644
--- a/src/lib/meson.build
+++ b/src/lib/meson.build
@@ -30,7 +30,7 @@ enventor_lib = library('enventor', enventor_src,
c_args : [ enventor_cargs,
'-DHAVE_CONFIG_H',
'-DENVENTOR_WIN32_BUILD_SUPPORT',
- '-I' + join_paths(meson.source_root(), 'src/include')
+ '-I' + join_paths(meson.project_source_root(), 'src/include')
],
dependencies : enventor_deps,
include_directories : config_dir,
@@ -38,7 +38,7 @@ enventor_lib = library('enventor', enventor_src,
version : meson.project_version()
)
-enventor = declare_dependency(
+enventor_dep = declare_dependency(
include_directories : [ include_directories('.')],
link_with : enventor_lib,
dependencies : enventor_deps
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
