summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-05-18 17:18:54 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-26 10:15:14 +0200
commit46cedab6ccd88976b01d53995402dbeb01d1b4b5 (patch)
tree009d0f385364efcc07d73e90092db85d610d8f97
parent532e8056c60188212e468e0ec68514b840366ee3 (diff)
build: move EFL_BUILD to package_c_args used in all subprojects
Original patch by Vincent Torri. Co-authored with Marcel Hollerbach. fixup Reviewed-by: Vincent Torri <vincent.torri@gmail.com> Reviewed-by: João Paulo Taylor Ienczak Zanette <joao.tiz@expertisesolutions.com.br> Differential Revision: https://phab.enlightenment.org/D11851
-rw-r--r--meson.build17
1 files changed, 11 insertions, 6 deletions
diff --git a/meson.build b/meson.build
index 35449d3442..10a48f2043 100644
--- a/meson.build
+++ b/meson.build
@@ -96,7 +96,6 @@ foreach lang : ['c', 'objc', 'cpp']
96 add_global_arguments('-D_GNU_SOURCE=1', language: lang) 96 add_global_arguments('-D_GNU_SOURCE=1', language: lang)
97 add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang) 97 add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang)
98 add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang) 98 add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang)
99 add_global_arguments('-DEFL_BUILD=1', language: lang)
100 add_global_arguments('-DELM_INTERNAL_API_ARGESFSDFEFC=1', language: lang) 99 add_global_arguments('-DELM_INTERNAL_API_ARGESFSDFEFC=1', language: lang)
101 if sys_windows == true 100 if sys_windows == true
102 add_global_arguments('-D_POSIX_C_SOURCE=200809L', language: lang) 101 add_global_arguments('-D_POSIX_C_SOURCE=200809L', language: lang)
@@ -240,7 +239,6 @@ if sys_exe_extension == ''
240else 239else
241 config_h.set_quoted('EXE_SUFFIX', '.'+sys_exe_extension) 240 config_h.set_quoted('EXE_SUFFIX', '.'+sys_exe_extension)
242endif 241endif
243config_h.set('EFL_BUILD', '1')
244 242
245if get_option('tslib') == true 243if get_option('tslib') == true
246 config_h.set('HAVE_TSLIB', '1') 244 config_h.set('HAVE_TSLIB', '1')
@@ -360,10 +358,6 @@ tmp_empty = declare_dependency()
360foreach package : subprojects 358foreach package : subprojects
361 package_name = package[0] 359 package_name = package[0]
362 package_version_name = '-'.join(package_name.split('_')) + '-' + version_major 360 package_version_name = '-'.join(package_name.split('_')) + '-' + version_major
363 package_c_args = [
364 '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"',
365 '-DNEED_RUN_IN_TREE=1',
366 ]
367 automatic_pkgfile = true 361 automatic_pkgfile = true
368 if package[1].length() == 0 or get_option(package[1][0]) 362 if package[1].length() == 0 or get_option(package[1][0])
369 config_h.set('HAVE_'+package_name.to_upper().underscorify(), '1') 363 config_h.set('HAVE_'+package_name.to_upper().underscorify(), '1')
@@ -396,6 +390,12 @@ foreach package : subprojects
396 endif 390 endif
397 endforeach 391 endforeach
398 392
393 #package_c_args definition for lib and module
394 package_c_args = [
395 '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"',
396 '-DNEED_RUN_IN_TREE=1',
397 '-DEFL_BUILD=1',
398 ]
399 if (package[3]) 399 if (package[3])
400 subdir(join_paths(local_lib, package_name)) 400 subdir(join_paths(local_lib, package_name))
401 set_variable(package_name + '_eo_files', pub_eo_files) 401 set_variable(package_name + '_eo_files', pub_eo_files)
@@ -406,6 +406,11 @@ foreach package : subprojects
406 if (package[2]) 406 if (package[2])
407 subdir(join_paths(local_module, package_name)) 407 subdir(join_paths(local_module, package_name))
408 endif 408 endif
409 #package_c_args definition for the rest
410 package_c_args = [
411 '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"',
412 '-DNEED_RUN_IN_TREE=1',
413 ]
409 if (package[4]) 414 if (package[4])
410 subdir(join_paths(local_bin, package_name)) 415 subdir(join_paths(local_bin, package_name))
411 endif 416 endif