bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=f488057e322b1c0a805a7ce52fa5e4237d177a32
commit f488057e322b1c0a805a7ce52fa5e4237d177a32 Author: Marcel <[email protected]> Date: Sat Nov 4 10:32:28 2017 +0000 build: use a include directory and not relative paths in older meson versions relative paths are sometimes evalulated from the build directory and sometimes from the source diretory. --- src/bin/meson.build | 2 ++ src/lib/meson.build | 2 ++ src/tests/meson.build | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bin/meson.build b/src/bin/meson.build index 809c4c2..c8d8308 100644 --- a/src/bin/meson.build +++ b/src/bin/meson.build @@ -21,6 +21,8 @@ src = files([ 'edi_searchpanel.h', ]) +bin_dir = include_directories('.') + foreach package : packages subdir(package) endforeach diff --git a/src/lib/meson.build b/src/lib/meson.build index 33a1992..691a47d 100644 --- a/src/lib/meson.build +++ b/src/lib/meson.build @@ -23,6 +23,8 @@ src = files([ 'md5.h', ]) +lib_dir = include_directories('.') + edi_lib_lib = shared_library('edi', src, dependencies : [elm], include_directories : top_inc, diff --git a/src/tests/meson.build b/src/tests/meson.build index 5c50f9a..482acd1 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -12,7 +12,7 @@ src = files([ check = dependency('check') deps = [elm, check, edi_lib, intl] -incls = [include_directories('../../../src/bin'), include_directories('../../../src/lib'), top_inc] +incls = [lib_dir, bin_dir, top_inc] if get_option('libclang') == true deps += [clang] --
