diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-05-20 17:53:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-05-24 00:43:55 +0200 |
| commit | 11ee457964181fbc59aa1b06e3788de24a2763b8 (patch) | |
| tree | 851757d9aaa0bee99aa32adca6b257eb7833ad78 | |
| parent | 54dc5bcedebf019c2bc2fbcb22982bc058afbdff (diff) | |
Configure boost-test in test/wscript.
Then we can use it in test/lib and test/wx.
| -rw-r--r-- | test/lib/wscript | 14 | ||||
| -rw-r--r-- | test/wscript | 14 |
2 files changed, 13 insertions, 15 deletions
diff --git a/test/lib/wscript b/test/lib/wscript index e71d0c291..c0553b08d 100644 --- a/test/lib/wscript +++ b/test/lib/wscript @@ -17,20 +17,6 @@ # along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>. # -def configure(conf): - boost_test_suffix='' - if conf.env.TARGET_WINDOWS_64: - boost_test_suffix='-mt-x64' - elif conf.env.TARGET_WINDOWS_32: - boost_test_suffix='-mt-x32' - - conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True) - - conf.check_cxx(fragment=""" - #define BOOST_TEST_MODULE Config test\n - #include <boost/test/unit_test.hpp>\n - int main() {} - """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST') def build(bld): obj = bld(features='cxx cxxprogram') diff --git a/test/wscript b/test/wscript index 9b5d22ccc..edb2a4b45 100644 --- a/test/wscript +++ b/test/wscript @@ -18,7 +18,19 @@ # def configure(conf): - conf.recurse('lib') + boost_test_suffix='' + if conf.env.TARGET_WINDOWS_64: + boost_test_suffix='-mt-x64' + elif conf.env.TARGET_WINDOWS_32: + boost_test_suffix='-mt-x32' + + conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True) + + conf.check_cxx(fragment=""" + #define BOOST_TEST_MODULE Config test\n + #include <boost/test/unit_test.hpp>\n + int main() {} + """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST') def build(bld): bld.recurse('lib') |