Procházet zdrojové kódy

meson: WIP: add dependencies for building on android

Alexandre Janniaux před 5 roky
rodič
revize
9a661ece53
1 změnil soubory, kde provedl 15 přidání a 1 odebrání
  1. 15 1
      meson.build

+ 15 - 1
meson.build

@@ -125,6 +125,18 @@ if cc.has_type('struct timespec', prefix: '#include <time.h>')
   conf_data.set('HAVE_STRUCT_TIMESPEC', 1)
 endif
 
+have_iconv = cc.has_function('iconv_open', prefix: '#include <iconv.h>')
+dep_iconv = []
+if not have_iconv
+  dep_iconv += [cc.find_library('iconv', required: false)]
+  have_iconv = cc.has_function('iconv_open',
+                               prefix: '#include <iconv.h>',
+                               dependencies: dep_iconv)
+endif
+
+if not have_iconv
+  error('iconv is not available')
+endif
 
 config_header = configure_file(
   input: 'config.h.meson',
@@ -167,11 +179,13 @@ includes = include_directories('.', 'contrib', 'include', 'compat')
 
 add_project_arguments('-DHAVE_CONFIG_H=1', language: ['c'])
 
+dep_log = [cc.find_library('log', required: true)]
+
 libdsm = library('dsm',
   libdsm_sources,
   version: meson.project_version(),
   include_directories: includes,
-  dependencies: [dep_tasn1, dep_thread])
+  dependencies: [dep_tasn1, dep_thread, dep_iconv, dep_log])
 
 pkg_mod = import('pkgconfig')
 pkg_mod.generate(