[libdazzle] Use include_directories()



commit 50c1baa402dfd7924daa2927902bb447cb1a19da
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue May 30 11:53:30 2017 +0100

    Use include_directories()
    
    There's no need to tweak the project arguments with inclusion
    directives.

 meson.build     |    5 +++--
 src/meson.build |   14 ++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/meson.build b/meson.build
index 28dee2c..6d52ad2 100644
--- a/meson.build
+++ b/meson.build
@@ -37,11 +37,12 @@ configure_file(
 
 add_project_arguments([
   '-DHAVE_CONFIG_H',
-  '-I' + meson.build_root(),
-  '-I' + join_paths(meson.source_root(), 'src'),
   '-DDAZZLE_COMPILATION',
 ], language: 'c')
 
+root_inc = include_directories('.')
+src_inc = include_directories('src')
+
 cc = meson.get_compiler('c')
 
 global_c_args = []
diff --git a/src/meson.build b/src/meson.build
index ddb0321..6e2e0f7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -397,14 +397,12 @@ libdazzle = library(
   'dazzle-' + apiversion,
   libdazzle_sources,
 
-  link_depends: 'dazzle.map',
-        c_args: libdazzle_args,
-     link_args: [ '-Wl,--version-script,' + join_paths(meson.current_source_dir(), 'dazzle.map') ],
-  dependencies: libdazzle_deps,
-     soversion: soversion,
-       version: libversion,
-       install: true,
-   install_dir: libdir,
+         link_depends: 'dazzle.map',
+               c_args: libdazzle_args,
+            link_args: [ '-Wl,--version-script,' + join_paths(meson.current_source_dir(), 'dazzle.map') ],
+         dependencies: libdazzle_deps,
+  include_directories: [ root_inc, src_inc ],
+              install: true,
 )
 
 libdazzle_dep = declare_dependency(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]