build: more accurate dependencies on Boost libraries
See also named-data/ndn-cxx@5686c51b87b6a642aa2dc8d93e061caebbb226cc
Change-Id: I9da751fe934558c753eeac0b93d7a4d505e4eb91
diff --git a/tests/wscript b/tests/wscript
index 55295bd..499d754 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -8,7 +8,7 @@
target=f'{top}/unit-tests',
name='unit-tests',
source=bld.path.ant_glob(['*.cpp', 'unit-tests/**/*.cpp']),
- use='libndn-cert',
+ use='BOOST_TESTS libndn-cert',
defines=[tmpdir],
includes=top,
install_path=None)
diff --git a/tools/wscript b/tools/wscript
index 9d198e7..63ca38b 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -7,16 +7,16 @@
name='ndncert-client',
target=f'{top}/bin/ndncert-client',
source='ndncert-client.cpp',
- use='libndn-cert')
+ use='BOOST_TOOLS libndn-cert')
bld.program(
name='ndncert-ca-server',
target=f'{top}/bin/ndncert-ca-server',
source='ndncert-ca-server.cpp',
- use='libndn-cert')
+ use='BOOST_TOOLS libndn-cert')
bld.program(
name='ndncert-ca-status',
target=f'{top}/bin/ndncert-ca-status',
source='ndncert-ca-status.cpp',
- use='libndn-cert')
+ use='BOOST_TOOLS libndn-cert')
diff --git a/wscript b/wscript
index 7eb451f..8fd6573 100644
--- a/wscript
+++ b/wscript
@@ -39,16 +39,18 @@
conf.check_sqlite3()
conf.check_openssl(lib='crypto', atleast_version='1.1.1')
- boost_libs = ['system', 'program_options', 'filesystem']
- if conf.env.WITH_TESTS:
- boost_libs.append('unit_test_framework')
-
- conf.check_boost(lib=boost_libs, mt=True)
+ conf.check_boost(lib='filesystem', mt=True)
if conf.env.BOOST_VERSION_NUMBER < 106501:
conf.fatal('The minimum supported version of Boost is 1.65.1.\n'
'Please upgrade your distribution or manually install a newer version of Boost.\n'
'For more information, see https://redmine.named-data.net/projects/nfd/wiki/Boost')
+ if conf.env.WITH_TESTS:
+ conf.check_boost(lib='filesystem unit_test_framework', mt=True, uselib_store='BOOST_TESTS')
+
+ if conf.env.WITH_TOOLS:
+ conf.check_boost(lib='program_options', mt=True, uselib_store='BOOST_TOOLS')
+
conf.check_compiler_flags()
# Loading "late" to prevent tests from being compiled with profiling flags
@@ -69,14 +71,15 @@
conf.write_config_header('src/detail/ndncert-config.hpp', define_prefix='NDNCERT_')
def build(bld):
- bld.shlib(target='ndn-cert',
- name='libndn-cert',
- vnum=VERSION,
- cnum=VERSION,
- source=bld.path.ant_glob('src/**/*.cpp'),
- use='NDN_CXX BOOST OPENSSL SQLITE3',
- includes='src',
- export_includes='src')
+ bld.shlib(
+ target='ndn-cert',
+ name='libndn-cert',
+ vnum=VERSION,
+ cnum=VERSION,
+ source=bld.path.ant_glob('src/**/*.cpp'),
+ use='BOOST NDN_CXX OPENSSL SQLITE3',
+ includes='src',
+ export_includes='src')
if bld.env.WITH_TESTS:
bld.recurse('tests')