From 019ed298a6ee5ab17de92c5d35367ecaf9ee040c Mon Sep 17 00:00:00 2001 From: Jongmin Lee Date: Wed, 12 Aug 2020 09:03:45 +0900 Subject: [PATCH] ector: remove include path in pc file ector.pc defines Cflags as '-I${includedir}/ector-1'. However, there are no files in ector-1 directory. The recent version of cmake checks whether the include path contains files or not. If there are no files, it stops compilation with errors. Since ector does not expose any header files, it should not define any include path. Change-Id: I15ba71a1dbdf246e5637b51c6bcd2a0d992dcf37 --- meson.build | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/meson.build b/meson.build index 475adfa..a1663a1 100644 --- a/meson.build +++ b/meson.build @@ -478,32 +478,43 @@ foreach package : subprojects if (package[8] and get_option('efl-one')) efl_one_sub_dirs += [package_version_name] + tmp_package_subdirs endif - pkgconfig.generate(tmp_lib, - name : '-'.join(package_name.split('_')), - subdirs : [package_version_name] + tmp_package_subdirs, - version : version_major + '.' + version_minor + '.' + version_micro, - libraries : tmp_pub_deps, - requires : package[9], - variables : package_pc_variables - ) - if package_name == 'ethumb_client' + if package_name == 'ector' + pkgconfig.generate(tmp_lib, + name : package_name, + subdirs : tmp_package_subdirs, + version : version_major + '.' + version_minor + '.' + version_micro, + libraries : tmp_pub_deps, + requires : package[9], + variables : package_pc_variables + ) + else pkgconfig.generate(tmp_lib, - name : package_name, - subdirs : [package_version_name] + tmp_package_subdirs, - version : version_major + '.' + version_minor + '.' + version_micro, - libraries : tmp_pub_deps, - requires : package[9], - variables : package_pc_variables - ) - elif package_name == 'ecore' - pkgconfig.generate(tmp_lib, - name : package_name+'-core', + name : '-'.join(package_name.split('_')), subdirs : [package_version_name] + tmp_package_subdirs, version : version_major + '.' + version_minor + '.' + version_micro, libraries : tmp_pub_deps, requires : package[9], variables : package_pc_variables ) + if package_name == 'ethumb_client' + pkgconfig.generate(tmp_lib, + name : package_name, + subdirs : [package_version_name] + tmp_package_subdirs, + version : version_major + '.' + version_minor + '.' + version_micro, + libraries : tmp_pub_deps, + requires : package[9], + variables : package_pc_variables + ) + elif package_name == 'ecore' + pkgconfig.generate(tmp_lib, + name : package_name+'-core', + subdirs : [package_version_name] + tmp_package_subdirs, + version : version_major + '.' + version_minor + '.' + version_micro, + libraries : tmp_pub_deps, + requires : package[9], + variables : package_pc_variables + ) + endif endif endif else -- 2.7.4