summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2019-04-24 02:31:46 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-24 15:11:17 +0200
commit132c00a4cb861302deb9cb6740985f80c5657b67 (patch)
tree509f51fd113d7456f40e759aaf57a517ab7b6f44
parent1799f79c54f6772b94ba89ea8966a6f7266d8687 (diff)
meson: Fix evas engine install directory.
Evas module loading code assumes engines are installed in evas/modules/engines. As part of the fixes building evas with meson, the engines are under a subproject named evas/engines, causing the modules to be installed in libdir/evas/engines/modules by default. This commit adds a override of the directory the engine modules are installed to use the correct location. Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D8693
-rw-r--r--src/modules/evas/engines/meson.build5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build
index 6eb53e4c04..bc1da80728 100644
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@ -38,7 +38,10 @@ foreach engine_conf : engines
38 set_variable(var_name, engine_dep) 38 set_variable(var_name, engine_dep)
39 39
40 mod_full_name = engine 40 mod_full_name = engine
41 mod_install_dir = join_paths(dir_package_modules, 'engines', engine, version_name) 41 # root meson.build declares the root evas engines project as `evas/engines`,
42 # but modules must be installed in evas/modules
43 evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
44 mod_install_dir = join_paths(evas_package_modules, 'engines', engine, version_name)
42 45
43 subdir(engine) 46 subdir(engine)
44 47