Merge branch 'master' into develop

meson.build

@@ -2,7 +2,7 @@ project(
   'edi', 'c',
   version : '0.6.99',
   default_options: [ 'c_std=gnu99', 'warning_level=2' ],
-  meson_version : '>= 0.40.0')
+  meson_version : '>= 0.39.0')
 
 add_global_arguments('-DHAVE_CONFIG_H=1', '-DHAVE_CONFIG=1', language: 'c')
 
@@ -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

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')

src/bin/meson.build

@@ -21,6 +21,8 @@ src = files([
   'edi_searchpanel.h',
 ])
 
+bin_dir = include_directories('.')
+
 foreach package : packages
    subdir(package)
 endforeach

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,

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]