summaryrefslogtreecommitdiff
path: root/cmakeconfig
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-06-10 08:49:03 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-06-10 08:49:04 -0400
commit55eeac0604fc1619aa86f7935fa1e7e93221722c (patch)
tree64bc715f96e38bb17702bb0098d15654f7ff16eb /cmakeconfig
parent24a7682ab0b19a8ecd2fde0a8cd4a0336807d43c (diff)
meson: fix cmake generation
Summary: there were missing Version files. These are generated now. Tested and verified with ecrire. Reviewers: zmike, segfaultxavi Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9054
Diffstat (limited to 'cmakeconfig')
-rw-r--r--cmakeconfig/meson.build31
1 files changed, 18 insertions, 13 deletions
diff --git a/cmakeconfig/meson.build b/cmakeconfig/meson.build
index 158b2a9..6140375 100644
--- a/cmakeconfig/meson.build
+++ b/cmakeconfig/meson.build
@@ -31,6 +31,9 @@ cmake_version_src = [
31 'Elementary', 31 'Elementary',
32] 32]
33 33
34conf = configuration_data()
35conf.set('VERSION', meson.project_version())
36
34foreach cmake_file : cmake_src 37foreach cmake_file : cmake_src
35 configure_file( 38 configure_file(
36 input: cmake_file+'Config.cmake.in', 39 input: cmake_file+'Config.cmake.in',
@@ -38,19 +41,21 @@ foreach cmake_file : cmake_src
38 install_dir: join_paths(dir_lib, 'cmake', cmake_file), 41 install_dir: join_paths(dir_lib, 'cmake', cmake_file),
39 copy: true, 42 copy: true,
40 ) 43 )
41endforeach 44 if cmake_version_src.contains(cmake_src)
42 45 configure_file(
43conf = configuration_data() 46 input: cmake_version_file+'ConfigVersion.cmake.in',
44 47 output: cmake_version_file+'ConfigVersion.cmake',
45conf.set('VERSION', meson.version()) 48 install_dir: join_paths(dir_lib, 'cmake', cmake_version_file),
46 49 configuration : conf,
47foreach cmake_version_file : cmake_version_src 50 )
48 configure_file( 51 else
49 input: cmake_version_file+'ConfigVersion.cmake.in', 52 configure_file(
50 output: cmake_version_file+'ConfigVersion.cmake', 53 input: 'EflConfigVersion.cmake.in',
51 install_dir: join_paths(dir_lib, 'cmake', cmake_version_file), 54 output: cmake_file+'ConfigVersion.cmake',
52 configuration : conf, 55 install_dir: join_paths(dir_lib, 'cmake', cmake_file),
53 ) 56 configuration : conf,
57 )
58 endif
54endforeach 59endforeach
55 60
56configure_file( 61configure_file(