From cf3888124802848de99faefb6e638bb8096c43d3 Mon Sep 17 00:00:00 2001 From: Tomasz Golinski Date: Wed, 20 May 2020 13:57:59 +0200 Subject: [PATCH] gpxlib now supports pkgconfig, so we can use it --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index b649fb1..913b424 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('geostat', 'cpp', default_options : ['cpp_std=c++2a']) curl_dep = dependency('libcurl') json_dep = dependency('nlohmann_json') sqlite_dep = dependency('sqlite3') -#tinyxml_dep = dependency('tinyxml2') +gpx_dep = dependency('gpxlib') magick_dep = dependency('Magick++', required : false) if not magick_dep.found() @@ -13,13 +13,13 @@ if not magick_dep.found() error('ImageMagick++ or GraphicsMagick++ not found.') endif -link = ['-lgpx', '-lheatmap'] +link = ['-lheatmap'] src = ['geostat.cpp', 'okapi.cpp', 'cache.cpp', 'debug.cpp', 'heat.cpp', 'ocdb.cpp', 'common.cpp', 'region.cpp'] src_cli = ['geostat_cli.cpp', 'okapi.cpp', 'gpx.cpp', 'cache.cpp', 'debug.cpp', 'heat.cpp', 'ocdb.cpp', 'common.cpp'] src_db = ['geodb.cpp', 'debug.cpp', 'ocdb.cpp', 'okapi.cpp', 'cache.cpp', 'common.cpp'] executable('geostat', src, dependencies : [curl_dep, json_dep, magick_dep, sqlite_dep], link_args: link, install: true) -executable('geostat_cli', src_cli, dependencies : [curl_dep, json_dep, magick_dep, sqlite_dep], link_args: link, install: true) +executable('geostat_cli', src_cli, dependencies : [curl_dep, json_dep, magick_dep, sqlite_dep, gpx_dep], link_args: link, install: true) executable('geodb', src_db, dependencies : [sqlite_dep, json_dep, curl_dep], install: true) configure_file(input: 'rating-star.png', output: '@PLAINNAME@', copy: true, install: true, install_dir: '.')