diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-06-10 08:49:03 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-06-10 08:49:04 -0400 |
| commit | 55eeac0604fc1619aa86f7935fa1e7e93221722c (patch) | |
| tree | 64bc715f96e38bb17702bb0098d15654f7ff16eb /cmakeconfig | |
| parent | 24a7682ab0b19a8ecd2fde0a8cd4a0336807d43c (diff) | |
| download | efl-55eeac0604fc1619aa86f7935fa1e7e93221722c.tar.gz | |
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.build | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/cmakeconfig/meson.build b/cmakeconfig/meson.build index 158b2a9dc6..6140375a87 100644 --- a/cmakeconfig/meson.build +++ b/cmakeconfig/meson.build @@ -31,6 +31,9 @@ cmake_version_src = [ 'Elementary', ] +conf = configuration_data() +conf.set('VERSION', meson.project_version()) + foreach cmake_file : cmake_src configure_file( input: cmake_file+'Config.cmake.in', @@ -38,19 +41,21 @@ foreach cmake_file : cmake_src install_dir: join_paths(dir_lib, 'cmake', cmake_file), copy: true, ) -endforeach - -conf = configuration_data() - -conf.set('VERSION', meson.version()) - -foreach cmake_version_file : cmake_version_src - configure_file( - input: cmake_version_file+'ConfigVersion.cmake.in', - output: cmake_version_file+'ConfigVersion.cmake', - install_dir: join_paths(dir_lib, 'cmake', cmake_version_file), - configuration : conf, - ) + if cmake_version_src.contains(cmake_src) + configure_file( + input: cmake_version_file+'ConfigVersion.cmake.in', + output: cmake_version_file+'ConfigVersion.cmake', + install_dir: join_paths(dir_lib, 'cmake', cmake_version_file), + configuration : conf, + ) + else + configure_file( + input: 'EflConfigVersion.cmake.in', + output: cmake_file+'ConfigVersion.cmake', + install_dir: join_paths(dir_lib, 'cmake', cmake_file), + configuration : conf, + ) + endif endforeach configure_file( |