summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-27 14:38:32 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-27 15:35:54 +0200
commit7da3eb84ab7147b023f7b2dfab62fa8f18fe073c (patch)
treeb1d490a5ca81ba9dd879609dbe0f4438293667d3
parent28cf881861e5627d8ba7ad608a47fd2b601d3455 (diff)
build: efl-one track all subdirs correctly
this was missed before, so the subdirectories have not been correctly added. With this you can now simply build with efl-one with including <Elementary.h> Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11893
-rw-r--r--meson.build6
1 files changed, 5 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 5f6c339907..06213426ce 100644
--- a/meson.build
+++ b/meson.build
@@ -361,6 +361,7 @@ efl_one_parts = []
361efl_one_deps = [] 361efl_one_deps = []
362efl_one_eo_deps = [] 362efl_one_eo_deps = []
363efl_one_include_dirs = [] 363efl_one_include_dirs = []
364efl_one_sub_dirs = []
364tmp_empty = declare_dependency() 365tmp_empty = declare_dependency()
365 366
366foreach package : subprojects 367foreach package : subprojects
@@ -462,7 +463,9 @@ foreach package : subprojects
462 foreach subdir : package_header_subdirs 463 foreach subdir : package_header_subdirs
463 tmp_package_subdirs += join_paths(package_version_name, subdir) 464 tmp_package_subdirs += join_paths(package_version_name, subdir)
464 endforeach 465 endforeach
465 466 if (package[8] and get_option('efl-one'))
467 efl_one_sub_dirs += [package_version_name] + tmp_package_subdirs
468 endif
466 pkgconfig.generate(tmp_lib, 469 pkgconfig.generate(tmp_lib,
467 name : '-'.join(package_name.split('_')), 470 name : '-'.join(package_name.split('_')),
468 subdirs : [package_version_name] + tmp_package_subdirs, 471 subdirs : [package_version_name] + tmp_package_subdirs,
@@ -503,6 +506,7 @@ if (get_option('efl-one'))
503 506
504 pkgconfig.generate( 507 pkgconfig.generate(
505 name : 'efl-one', 508 name : 'efl-one',
509 subdirs : efl_one_sub_dirs,
506 description: 'Configureation for efl in one big fat .so', 510 description: 'Configureation for efl in one big fat .so',
507 libraries : [efl_one] + eina_pc_deps, #eina is a special case here which drags in m dl & threads 511 libraries : [efl_one] + eina_pc_deps, #eina is a special case here which drags in m dl & threads
508 ) 512 )