[libgda] Meson: fixing browser using math library



commit c4d9bf9e917c9b55f91c7f9004a24c404f9df5bf
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Jul 5 11:29:56 2018 -0500

    Meson: fixing browser using math library

 meson.build       |  3 +++
 tools/meson.build | 39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index fe386f5c4..2aadc05ff 100644
--- a/meson.build
+++ b/meson.build
@@ -177,6 +177,9 @@ if enable_ui
        gdkpixbuf_dep = dependency('gdk-pixbuf-2.0')
        glade_dep = dependency('gladeui-2.0', required : false)
        goocanvas_dep = dependency('goocanvas-2.0', required: false)
+       if goocanvas_dep.found()
+               math_dep = meson.get_compiler('c').find_library('m')
+       endif
        gtksourceview_dep = dependency('gtksourceview-3.0')
        graphviz_dep = dependency('libgvc', required: false)
        graphviz_cargs = []
diff --git a/tools/meson.build b/tools/meson.build
index 7f23b3195..83d0922f7 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -22,6 +22,7 @@ browser_deps = [
 
 if goocanvas_dep.found()
        browser_deps += goocanvas_dep
+       browser_deps += math_dep
 endif
 
 browser_resourcesc = custom_target('browser_resourcesc',
@@ -95,4 +96,40 @@ executable('gda-browser-'+project_api_version,
        )
 
 
-endif
\ No newline at end of file
+endif
+
+tsplitter_deps = [
+               libgda_dep,
+               inc_rooth_dep,
+               inc_sqliteh_dep,
+               inc_browserh_dep,
+               inc_browserdirh_dep,
+               inc_commonh_dep,
+               inc_browser_baseh_dep
+               ]
+if soup_dep.found()
+       tsplitter_deps += soup_dep
+endif
+
+tsplitter_sources = files(['test-splitter.c'])
+
+tsplitter_sources += tools_nonuisources
+tsplitter_sources += basetool_sources
+
+tsplitter = executable('test-splitter',
+       tsplitter_sources,
+       c_args: [
+               '-include',
+               meson.build_root() + '/config.h',
+               '-DROOT_DIR="'+meson.build_root()+'"'
+               ],
+       link_with: libgda,
+       dependencies: tsplitter_deps,
+       install: false
+       )
+test('Splitter', tsplitter,
+       env: [
+               'GDA_TOP_SRC_DIR='+meson.source_root(),
+               'GDA_TOP_BUILD_DIR='+meson.build_root()
+               ]
+       )
\ No newline at end of file


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