zmike pushed a commit to branch efl-1.22. http://git.enlightenment.org/core/efl.git/commit/?id=144bb7e10cb55d91e106b0b201c356578729af8a
commit 144bb7e10cb55d91e106b0b201c356578729af8a Author: Marcel Hollerbach <[email protected]> Date: Thu Apr 18 09:31:57 2019 -0400 meson: unbreak cxx header installation Summary: before we had *correct* fileds in the subdir: keyword. However, install_dir: was wrong, so *this* time, this seems right. Reviewers: cedric, zmike, segfaultxavi, raster Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8634 --- src/bindings/cxx/efl_cxx/meson.build | 2 +- src/bindings/cxx/eina_cxx/meson.build | 2 +- src/bindings/cxx/meson.build | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/bindings/cxx/efl_cxx/meson.build b/src/bindings/cxx/efl_cxx/meson.build index 44113d324a..0dca3250c9 100644 --- a/src/bindings/cxx/efl_cxx/meson.build +++ b/src/bindings/cxx/efl_cxx/meson.build @@ -1,5 +1,5 @@ cxx_header_src += join_paths(file_location, 'Efl.hh') install_headers(join_paths('..', file_location, 'cxx', 'efl_part_impl.hh'), - subdir: join_paths(dir_package_include, 'cxx') + subdir: join_paths(package_version_name, 'cxx') ) diff --git a/src/bindings/cxx/eina_cxx/meson.build b/src/bindings/cxx/eina_cxx/meson.build index fbe6f55ede..a08c416c98 100644 --- a/src/bindings/cxx/eina_cxx/meson.build +++ b/src/bindings/cxx/eina_cxx/meson.build @@ -50,5 +50,5 @@ eina_cxx = declare_dependency( ) install_headers(eina_cxx_header_src, - subdir: dir_package_include + subdir: package_version_name ) diff --git a/src/bindings/cxx/meson.build b/src/bindings/cxx/meson.build index 8697473f09..d5b6295731 100644 --- a/src/bindings/cxx/meson.build +++ b/src/bindings/cxx/meson.build @@ -30,7 +30,6 @@ foreach lib : cxx_sublibs '-DNEED_RUN_IN_TREE=1' ] - dir_package_include = package_version_name dir_package_modules = join_paths(dir_lib, package_name, 'modules') cxx_generator_target = [] cxx_header_src = [] @@ -50,7 +49,7 @@ foreach lib : cxx_sublibs input : join_paths(subdir_file_location, cxx_gen_file), output : [cxx_gen_file + '.hh', cxx_gen_file + '.impl.hh'], install : true, - install_dir : join_paths(dir_package_include, eo_file_subdir), + install_dir : join_paths(dir_include, package_version_name, eo_file_subdir), command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories, '-o', join_paths(meson.current_build_dir(), cxx_gen_file + '.hh'), '@INPUT@']) @@ -64,7 +63,7 @@ foreach lib : cxx_sublibs input : eo_file_list, output : [lib[0] + '.eo.hh'], install : true, - install_dir : join_paths(dir_package_include), + install_dir : join_paths(dir_include, package_version_name), command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories, '-m', '-o', '@OUTPUT@', '@INPUT@']) @@ -97,7 +96,7 @@ foreach lib : cxx_sublibs endforeach install_headers(cxx_header_src, - subdir: dir_package_include + subdir: package_version_name, ) pkgconfig.generate( --
