bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=2c062ef0bbbfae6b29e79e6c69d6266e40e765cc
commit 2c062ef0bbbfae6b29e79e6c69d6266e40e765cc Author: Marcel <[email protected]> Date: Fri Nov 3 21:09:37 2017 +0000 Revert "meson: remove exposure of lookup paths" This reverts commit a7a6b9cb7fa0cd0f880e21c2d2f7853754fff95e. This brings back the option for settings the path, ubuntu decides to hide the headers in a none standard directory, so they need to be spectified. --- meson.build | 22 +++++++++++++--------- meson_options.txt | 2 ++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index cf4c08f..2800a46 100644 --- a/meson.build +++ b/meson.build @@ -40,20 +40,24 @@ else config_h.set_quoted('BEAR_COMMAND', '') endif -clang_header_dir = '' -clang_link_dir = '' +opt_clang_header_dir = get_option('libclang-headerdir') +opt_clang_link_dir = get_option('libclang-libdir') if build_machine.system() == 'darwin' - clang_header_dir = '/usr/local/opt/llvm/include' - clang_link_dir = '/usr/local/opt/llvm/lib' + if opt_clang_header_dir == '' + opt_clang_header_dir = '/usr/local/opt/llvm/include' + endif + if opt_clang_link_dir == '' + opt_clang_link_dir = '/usr/local/opt/llvm/lib' + endif endif if get_option('libclang') == true #check for the header found = false - if clang_header_dir != '' - found = cc.has_header('clang-c/Index.h', args : '-I'+clang_header_dir) + if opt_clang_header_dir != '' + found = cc.has_header('clang-c/Index.h', args : '-I'+opt_clang_header_dir) else found = cc.has_header('clang-c/Index.h') endif @@ -62,11 +66,11 @@ if get_option('libclang') == true error('Clang header not found!') endif - clang_inc = include_directories(clang_header_dir) + clang_inc = include_directories(opt_clang_header_dir) #check for the library to link - if clang_link_dir != '' - clang = cc.find_library('clang', dirs : [clang_link_dir]) + if opt_clang_link_dir != '' + clang = cc.find_library('clang', dirs : [opt_clang_link_dir]) else clang = cc.find_library('clang') endif diff --git a/meson_options.txt b/meson_options.txt index 10ae169..61f4286 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,4 @@ option('libclang', type : 'boolean', value : true, description : 'Weather to have libclang support') option('bear', type : 'boolean', value : true, description : 'Weather to have bear support') +option('libclang-libdir', type : 'string', value : '', description : 'Specify a none default location for your clang installation') +option('libclang-headerdir', type : 'string', value : '', description : 'Specify a none default location for your clang installation') --
