ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=3421d668f0be6dd9153a731c348a2be7e7b2a8ff
commit 3421d668f0be6dd9153a731c348a2be7e7b2a8ff
Author: Andy Williams <a...@andywilliams.me>
Date: Fri Oct 6 12:41:33 2017 +0100
Fixing up linux again - need a better solution for OSX as meson bails
---
meson.build | 2 +-
src/bin/meson.build | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 22bce40..e511f18 100644
--- a/meson.build
+++ b/meson.build
@@ -30,7 +30,7 @@ cc = meson.get_compiler('c')
config_h.set_quoted('EFL_CFLAGS', run_command(find_program('pkg-config'),
'--libs', '--cflags', 'elementary').stdout().strip())
-intl = cc.find_library('intl')
+intl = cc.find_library('intl', required : false)
bear = find_program('bear', required : false)
if get_option('bear') == true and bear.found()
diff --git a/src/bin/meson.build b/src/bin/meson.build
index 50844d0..829d938 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -26,16 +26,13 @@ foreach package : packages
endforeach
deps = [elm, edi_lib, intl]
-libs = []
if get_option('libclang') == true
deps += [clang]
- libs += include_directories('/usr/local/opt/llvm/include')
endif
executable('edi', src,
dependencies : deps,
- include_directories : libs,
install : true
)
--
