zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=55eeac0604fc1619aa86f7935fa1e7e93221722c
commit 55eeac0604fc1619aa86f7935fa1e7e93221722c
Author: Marcel Hollerbach <m...@marcel-hollerbach.de>
Date: Mon Jun 10 08:49:03 2019 -0400
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
---
cmakeconfig/meson.build | 31 ++++++++++++++++++-------------
1 file 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(
--
