diff options
| author | Stefan Schmidt <s.schmidt@samsung.com> | 2020-05-18 17:18:54 +0200 |
|---|---|---|
| committer | Stefan Schmidt <s.schmidt@samsung.com> | 2020-05-25 16:58:58 +0200 |
| commit | d64a96dadcafab788de8f42236fea0e1fc9bda1b (patch) | |
| tree | ca8123699a5346c554f50780ae02ef15a22c6bbf | |
| parent | c0c5bc71c5960408ceac135eb8fc250683d55ffd (diff) | |
| download | efl-d64a96dadcafab788de8f42236fea0e1fc9bda1b.tar.gz | |
build: move EFL_BUILD to package_c_args used in all subprojects
Original patch by Vincent Torri. Co-authored with Marcel Hollerbach.
Differential Revision: https://phab.enlightenment.org/D11851
fixup
| -rw-r--r-- | meson.build | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 35449d3442..6ce387c16b 100644 --- a/meson.build +++ b/meson.build @@ -96,7 +96,6 @@ foreach lang : ['c', 'objc', 'cpp'] add_global_arguments('-D_GNU_SOURCE=1', language: lang) add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang) add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang) - add_global_arguments('-DEFL_BUILD=1', language: lang) add_global_arguments('-DELM_INTERNAL_API_ARGESFSDFEFC=1', language: lang) if sys_windows == true add_global_arguments('-D_POSIX_C_SOURCE=200809L', language: lang) @@ -240,7 +239,6 @@ if sys_exe_extension == '' else config_h.set_quoted('EXE_SUFFIX', '.'+sys_exe_extension) endif -config_h.set('EFL_BUILD', '1') if get_option('tslib') == true config_h.set('HAVE_TSLIB', '1') @@ -360,10 +358,6 @@ tmp_empty = declare_dependency() foreach package : subprojects package_name = package[0] package_version_name = '-'.join(package_name.split('_')) + '-' + version_major - package_c_args = [ - '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"', - '-DNEED_RUN_IN_TREE=1', - ] automatic_pkgfile = true if package[1].length() == 0 or get_option(package[1][0]) config_h.set('HAVE_'+package_name.to_upper().underscorify(), '1') @@ -396,6 +390,12 @@ foreach package : subprojects endif endforeach + #package_c_args definition for lib and module + package_c_args = [ + '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"', + '-DNEED_RUN_IN_TREE=1', + '-DEFL_BUILD=1', + ] if (package[3]) subdir(join_paths(local_lib, package_name)) set_variable(package_name + '_eo_files', pub_eo_files) @@ -406,6 +406,11 @@ foreach package : subprojects if (package[2]) subdir(join_paths(local_module, package_name)) endif + #package_c_args definition for all but lib and module + package_c_args = [ + '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"', + '-DNEED_RUN_IN_TREE=1', + ] if (package[4]) subdir(join_paths(local_bin, package_name)) endif |