diff --git a/meson.build b/meson.build index 2cf1083..69ce5ba 100644 --- a/meson.build +++ b/meson.build @@ -30,15 +30,15 @@ cc = meson.get_compiler('c') config_h.set_quoted('EFL_CFLAGS', run_command(find_program('pkg-config'), '--libs', '--cflags', 'elementary').stdout().strip()) -if get_option('bear') == true - bear = find_program('bear') +bear = find_program('bear', required : false) +if get_option('bear') == true and bear.found() config_h.set_quoted('BEAR_COMMAND', 'bear') else config_h.set_quoted('BEAR_COMMAND', '') endif if get_option('libclang') == true - clang = cc.find_library('clang') + clang = cc.find_library('clang', dirs : ['/Library/Developer/CommandLineTools/usr/lib/']) clang_include_dir_command = run_command(find_program('scripts/clang_include_dir.sh')) clang_include_dir = clang_include_dir_command.stdout().strip() diff --git a/scripts/clang_include_dir.sh b/scripts/clang_include_dir.sh index a5b4ce5..f70a780 100755 --- a/scripts/clang_include_dir.sh +++ b/scripts/clang_include_dir.sh @@ -1,3 +1,3 @@ #!/bin/sh -clang -E - -v < /dev/null 2>&1 | grep "^ /usr" | grep clang +clang -E - -v < /dev/null 2>&1 | grep "^ /" | grep clang