diff options
author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-08-13 16:43:42 +0200 |
---|---|---|
committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-08-13 16:43:42 +0200 |
commit | d634be7110733d228645aa869739dbda446c3de7 (patch) | |
tree | 45e3ee254ebcfd7cc8972e598b152b3876bf253a | |
parent | 96e52ecd9fc1906a5d9f50a985f7c56d771f53fb (diff) |
tests: Don't include deprecated Boost header files
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | tests/test-context.cc | 2 | ||||
-rw-r--r-- | tests/test-font-face.cc | 2 | ||||
-rw-r--r-- | tests/test-font-options.cc | 2 | ||||
-rw-r--r-- | tests/test-matrix.cc | 2 | ||||
-rw-r--r-- | tests/test-scaled-font.cc | 2 | ||||
-rw-r--r-- | tests/test-surface.cc | 2 | ||||
-rw-r--r-- | tests/test-user-font.cc | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 28bf883..088992a 100644 --- a/configure.ac +++ b/configure.ac @@ -90,7 +90,7 @@ AS_IF([test "x$ENABLE_TESTS" = xyes], #So we resort to hugly hacks to detect the version of #boost that is installed. ####################################################### - AX_BOOST_BASE([1.33.1]) + AX_BOOST_BASE([1.63.0]) AX_BOOST_UNIT_TEST_FRAMEWORK dnl AX_BOOST_BASE defines a --with-boost[=DIR] option that sets diff --git a/meson.build b/meson.build index b4bfc0c..36b5449 100644 --- a/meson.build +++ b/meson.build @@ -147,7 +147,7 @@ xsltproc = find_program('xsltproc', required: build_documentation) USE_SHARED_BOOST = get_option('boost-shared') # Use shared Boost::Test? boost_unit_test_framework_dep = dependency('boost', modules: 'unit_test_framework', - static: not USE_SHARED_BOOST, version: '>=1.33.1', required: false) + static: not USE_SHARED_BOOST, version: '>=1.63.0', required: false) fontconfig_dep = dependency('fontconfig', required: false) test_dep = [ boost_unit_test_framework_dep, fontconfig_dep] diff --git a/tests/test-context.cc b/tests/test-context.cc index 910eb3a..830a099 100644 --- a/tests/test-context.cc +++ b/tests/test-context.cc @@ -8,7 +8,7 @@ #include <cfloat> #include <boost/test/unit_test.hpp> #include <boost/test/test_tools.hpp> -#include <boost/test/floating_point_comparison.hpp> +#include <boost/test/tools/floating_point_comparison.hpp> using namespace boost::unit_test; #include <cairomm/context.h> #include <cairomm/scaledfont.h> diff --git a/tests/test-font-face.cc b/tests/test-font-face.cc index 0f3571c..fb98868 100644 --- a/tests/test-font-face.cc +++ b/tests/test-font-face.cc @@ -9,7 +9,7 @@ #include <stdexcept> #include <boost/test/unit_test.hpp> #include <boost/test/test_tools.hpp> -#include <boost/test/floating_point_comparison.hpp> +#include <boost/test/tools/floating_point_comparison.hpp> using namespace boost::unit_test; #include <cairomm/fontface.h> #include <cairomm/scaledfont.h> diff --git a/tests/test-font-options.cc b/tests/test-font-options.cc index a51fad5..a786191 100644 --- a/tests/test-font-options.cc +++ b/tests/test-font-options.cc @@ -1,6 +1,6 @@ #include <boost/test/unit_test.hpp> #include <boost/test/test_tools.hpp> -#include <boost/test/floating_point_comparison.hpp> +#include <boost/test/tools/floating_point_comparison.hpp> #include <cairomm/fontoptions.h> diff --git a/tests/test-matrix.cc b/tests/test-matrix.cc index dd8f761..895c668 100644 --- a/tests/test-matrix.cc +++ b/tests/test-matrix.cc @@ -1,6 +1,6 @@ #include <boost/test/unit_test.hpp> #include <boost/test/test_tools.hpp> -#include <boost/test/floating_point_comparison.hpp> +#include <boost/test/tools/floating_point_comparison.hpp> using namespace boost::unit_test; #include <cairomm/matrix.h> diff --git a/tests/test-scaled-font.cc b/tests/test-scaled-font.cc index d6b861b..ff5f1a7 100644 --- a/tests/test-scaled-font.cc +++ b/tests/test-scaled-font.cc @@ -1,6 +1,6 @@ #include <boost/test/unit_test.hpp> #include <boost/test/test_tools.hpp> -#include <boost/test/floating_point_comparison.hpp> +#include <boost/test/tools/floating_point_comparison.hpp> using namespace boost::unit_test; #include <cairomm/scaledfont.h> #include <iostream> diff --git a/tests/test-surface.cc b/tests/test-surface.cc index e010929..50069c8 100644 --- a/tests/test-surface.cc +++ b/tests/test-surface.cc @@ -1,7 +1,7 @@ #include <fstream> #include <boost/test/unit_test.hpp> #include <boost/test/test_tools.hpp> -#include <boost/test/floating_point_comparison.hpp> +#include <boost/test/tools/floating_point_comparison.hpp> using namespace boost::unit_test; #include <cairomm/surface.h> using namespace Cairo; diff --git a/tests/test-user-font.cc b/tests/test-user-font.cc index 88fed02..ed7b19b 100644 --- a/tests/test-user-font.cc +++ b/tests/test-user-font.cc @@ -10,7 +10,7 @@ #include <iostream> #include <boost/test/unit_test.hpp> #include <boost/test/test_tools.hpp> -#include <boost/test/floating_point_comparison.hpp> +#include <boost/test/tools/floating_point_comparison.hpp> using namespace boost::unit_test; #include <cairomm/fontface.h> #include <cairomm/scaledfont.h> |