From ff14ad34254574040420f944508aeacfad93f100 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Thu, 21 Jan 2021 12:47:41 +0000 Subject: [PATCH] Link to libsqlite3 when required --- benchmark/build.py | 1 + demo/c++/build.py | 2 +- src/build.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/benchmark/build.py b/benchmark/build.py index b08724d8d..7f77e49b1 100644 --- a/benchmark/build.py +++ b/benchmark/build.py @@ -9,6 +9,7 @@ test_env = env.Clone() test_env['LIBS'] = [env['MAPNIK_NAME']] test_env.AppendUnique(LIBS=copy(env['LIBMAPNIK_LIBS'])) test_env.AppendUnique(LIBS='mapnik-wkt') +test_env.AppendUnique(LIBS='sqlite3') if env['PLATFORM'] == 'Linux': test_env.AppendUnique(LIBS='dl') test_env.AppendUnique(LIBS='rt') diff --git a/demo/c++/build.py b/demo/c++/build.py index c059b05da..d2d2bc5fa 100644 --- a/demo/c++/build.py +++ b/demo/c++/build.py @@ -41,7 +41,7 @@ if env['HAS_CAIRO']: demo_env.Append(CPPDEFINES = '-DHAVE_CAIRO') libraries = [env['MAPNIK_NAME']] -libraries.extend(copy(env['LIBMAPNIK_LIBS'])) +libraries.extend([copy(env['LIBMAPNIK_LIBS']), 'sqlite3', 'pthread']) rundemo = demo_env.Program('rundemo', source, LIBS=libraries) Depends(rundemo, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) diff --git a/src/build.py b/src/build.py index 1904b02f8..171fb941e 100644 --- a/src/build.py +++ b/src/build.py @@ -78,6 +78,7 @@ if '-DHAVE_PNG' in env['CPPDEFINES']: if '-DMAPNIK_USE_PROJ' in env['CPPDEFINES']: lib_env['LIBS'].append('proj') + lib_env['LIBS'].append('sqlite3') if '-DHAVE_TIFF' in env['CPPDEFINES']: lib_env['LIBS'].append('tiff')