summaryrefslogtreecommitdiff
path: root/src/bindings
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-18 09:31:57 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-04-18 12:30:22 -0400
commite881f936e819acb5a669178c06a76d7a9720eac2 (patch)
treecfbcaf2bf2dcac775bf48d63cf5233bb6cdcbea2 /src/bindings
parentecce595b241763dd3029a1bc39f10f4f664b3c9a (diff)
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
Diffstat (limited to 'src/bindings')
-rw-r--r--src/bindings/cxx/efl_cxx/meson.build2
-rw-r--r--src/bindings/cxx/eina_cxx/meson.build2
-rw-r--r--src/bindings/cxx/meson.build7
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 @@
1cxx_header_src += join_paths(file_location, 'Efl.hh') 1cxx_header_src += join_paths(file_location, 'Efl.hh')
2 2
3install_headers(join_paths('..', file_location, 'cxx', 'efl_part_impl.hh'), 3install_headers(join_paths('..', file_location, 'cxx', 'efl_part_impl.hh'),
4 subdir: join_paths(dir_package_include, 'cxx') 4 subdir: join_paths(package_version_name, 'cxx')
5) 5)
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(
50) 50)
51 51
52install_headers(eina_cxx_header_src, 52install_headers(eina_cxx_header_src,
53 subdir: dir_package_include 53 subdir: package_version_name
54) 54)
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
30 '-DNEED_RUN_IN_TREE=1' 30 '-DNEED_RUN_IN_TREE=1'
31 ] 31 ]
32 32
33 dir_package_include = package_version_name
34 dir_package_modules = join_paths(dir_lib, package_name, 'modules') 33 dir_package_modules = join_paths(dir_lib, package_name, 'modules')
35 cxx_generator_target = [] 34 cxx_generator_target = []
36 cxx_header_src = [] 35 cxx_header_src = []
@@ -50,7 +49,7 @@ foreach lib : cxx_sublibs
50 input : join_paths(subdir_file_location, cxx_gen_file), 49 input : join_paths(subdir_file_location, cxx_gen_file),
51 output : [cxx_gen_file + '.hh', cxx_gen_file + '.impl.hh'], 50 output : [cxx_gen_file + '.hh', cxx_gen_file + '.impl.hh'],
52 install : true, 51 install : true,
53 install_dir : join_paths(dir_package_include, eo_file_subdir), 52 install_dir : join_paths(dir_include, package_version_name, eo_file_subdir),
54 command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories, 53 command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories,
55 '-o', join_paths(meson.current_build_dir(), cxx_gen_file + '.hh'), 54 '-o', join_paths(meson.current_build_dir(), cxx_gen_file + '.hh'),
56 '@INPUT@']) 55 '@INPUT@'])
@@ -64,7 +63,7 @@ foreach lib : cxx_sublibs
64 input : eo_file_list, 63 input : eo_file_list,
65 output : [lib[0] + '.eo.hh'], 64 output : [lib[0] + '.eo.hh'],
66 install : true, 65 install : true,
67 install_dir : join_paths(dir_package_include), 66 install_dir : join_paths(dir_include, package_version_name),
68 command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories, '-m', 67 command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories, '-m',
69 '-o', '@OUTPUT@', 68 '-o', '@OUTPUT@',
70 '@INPUT@']) 69 '@INPUT@'])
@@ -97,7 +96,7 @@ foreach lib : cxx_sublibs
97 endforeach 96 endforeach
98 97
99 install_headers(cxx_header_src, 98 install_headers(cxx_header_src,
100 subdir: dir_package_include 99 subdir: package_version_name,
101 ) 100 )
102 101
103 pkgconfig.generate( 102 pkgconfig.generate(