bu5hm4n pushed a commit to branch feature/meson. http://git.enlightenment.org/core/efl.git/commit/?id=2bf643d8a06259ff929002de0d4e367b4264ecc7
commit 2bf643d8a06259ff929002de0d4e367b4264ecc7 Author: Marcel Hollerbach <[email protected]> Date: Thu Jan 4 09:37:32 2018 +0000 meson: PACKAGE_DATA dir must be defined per package --- meson.build | 2 +- src/bin/eolian/meson.build | 1 + src/lib/ecore/meson.build | 1 + src/lib/ecore_con/meson.build | 1 + src/lib/eeze/meson.build | 1 + src/lib/eolian/meson.build | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4fda2d1e3b..d3f48ae1df 100644 --- a/meson.build +++ b/meson.build @@ -73,7 +73,6 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name()) config_h.set_quoted('PACKAGE_BIN_DIR', dir_bin) config_h.set_quoted('PACKAGE_LIB_DIR', dir_lib) config_h.set_quoted('PACKAGE_BUILD_DIR', meson.current_source_dir()) -config_h.set_quoted('PACKAGE_DATA_DIR', join_paths(dir_data, meson.project_name())) config_h.set_quoted('PACKAGE_SYSCONF_DIR', dir_sysconf) config_h.set_quoted('BINDIR', dir_bin) config_h.set_quoted('DATADIR', dir_data) @@ -131,6 +130,7 @@ example_dirs = [] foreach package : subprojects package_name = package[0] package_version_name = package_name + '-' + version_major + package_c_args = ['-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"'] if get_option(package_name) config_h.set('HAVE_'+package_name.to_upper(), '1') diff --git a/src/bin/eolian/meson.build b/src/bin/eolian/meson.build index da6d051af4..2104676f3e 100644 --- a/src/bin/eolian/meson.build +++ b/src/bin/eolian/meson.build @@ -15,4 +15,5 @@ eolian_gen = executable('eolian_gen', eolian_gen_src, dependencies: eolian, install: true, + c_args : package_c_args, ) diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build index 96c78adfe7..977bbd3ced 100644 --- a/src/lib/ecore/meson.build +++ b/src/lib/ecore/meson.build @@ -180,6 +180,7 @@ ecore_lib = library('ecore', dependencies: [eina, eo, efl, m, ecore_deps], include_directories : config_dir + [include_directories(join_paths('..','..'))], install: true, + c_args : package_c_args, ) ecore = declare_dependency( diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build index 7ec0d03a1d..fc22885311 100644 --- a/src/lib/ecore_con/meson.build +++ b/src/lib/ecore_con/meson.build @@ -187,6 +187,7 @@ ecore_con_lib = library('ecore_con', dependencies: [ecore, ecore_con_deps, http_parser, eldbus, eet, systemd, dl], include_directories : config_dir, install: true, + c_args : package_c_args, ) ecore_con = declare_dependency( diff --git a/src/lib/eeze/meson.build b/src/lib/eeze/meson.build index 8582dcf4e6..de715f2596 100644 --- a/src/lib/eeze/meson.build +++ b/src/lib/eeze/meson.build @@ -77,6 +77,7 @@ eeze_lib = library('eeze', dependencies: [ecore, ecore_file, eeze_deps], include_directories : config_dir, install: true, + c_args : package_c_args, ) eeze = declare_dependency( diff --git a/src/lib/eolian/meson.build b/src/lib/eolian/meson.build index 20317cce09..34e8b922f2 100644 --- a/src/lib/eolian/meson.build +++ b/src/lib/eolian/meson.build @@ -34,6 +34,7 @@ eolian_lib = library('eolian', eolian_src, include_directories: config_dir, dependencies: eina, install: true, + c_args : package_c_args, ) eolian = declare_dependency( --
