enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

WIP: Solve meson warnings and deprecations #47

Draft
dimmus wants to merge 14 commits from dimmus/efl:devs/dimmus/meson into master
pull from: dimmus/efl:devs/dimmus/meson
merge into: enlightenment:master
Conversation 2 Commits 14 Files Changed 38 +5 -6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8beff7c4a1 - Show all commits

11
cmakeconfig/meson.build
View File

@ -1,4 +1,3 @@
cmake_src = [
'Ecore',
'EcoreCxx',
@ -39,21 +38,21 @@ foreach cmake_file : cmake_src
input: cmake_file+'Config.cmake.in',
output: cmake_file+'Config.cmake',
install_dir: join_paths(dir_lib, 'cmake', cmake_file),
copy: true,
configuration : conf
eschwartz commented 2023-12-05 05:59:53 -08:00
Review
Copy Link

In this case I would advise not using configure_file at all. It seems to have nothing to configure, so usong configuration: conf is "wrong" (newer meson actually wants you to use fs.copy()!!) but the purpose of either one is supposed to be for files that you need in the build directory. For installing files, just (rename them to avoid the useless .in and) use install_data() instead.

In this case I would advise not using configure_file at all. It seems to have nothing to configure, so usong configuration: conf is "wrong" (newer meson actually wants you to use fs.copy()!!) but the purpose of either one is supposed to be for files that you need in the build directory. For installing files, just (rename them to avoid the useless .in and) use install_data() instead.
dimmus commented 2023-12-05 09:59:02 -08:00
Review
Copy Link

caught it

caught it
)
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,
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,
configuration : conf
)
endif
endforeach
@ -62,5 +61,5 @@ configure_file(
input: 'EolianHelper.cmake.in',
output: 'EolianHelper.cmake',
install_dir: join_paths(dir_lib, 'cmake', 'Eolian'),
copy: true
)
configuration : conf
)