From 6faa665ecff4de0cb2dbd308cbcc94ef015c5d07 Mon Sep 17 00:00:00 2001 From: Tinko Sebastian Bartels Date: Sun, 28 Jun 2026 16:58:22 +0800 Subject: [PATCH 1/2] [extensions] Require cxx14 in Jamfile in preparation for removing it from build.jam re issue #1460 --- extensions/Jamfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/extensions/Jamfile b/extensions/Jamfile index 97a8f6ac35..7d24f7869a 100644 --- a/extensions/Jamfile +++ b/extensions/Jamfile @@ -8,12 +8,20 @@ # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +import-search /boost/config/checks ; +import config : requires ; + project boost-geometry-extensions : requirements msvc:on /boost/geometry//boost_geometry /boost/test//included + 14 + [ requires + cxx14_constexpr + cxx14_return_type_deduction + ] ; build-project test ; From 70b4b191d3c1d5a794e5e1da70b2840715af9a63 Mon Sep 17 00:00:00 2001 From: Tinko Sebastian Bartels Date: Sun, 28 Jun 2026 16:59:25 +0800 Subject: [PATCH 2/2] Move cxx14 checks from build.jam to buildable targets to address #1460 --- build.jam | 17 ++--------------- doc/src/examples/Jamfile | 8 ++++++++ example/Jamfile | 8 ++++++++ include/boost/geometry/srs/projections/code.hpp | 1 + index/Jamfile | 8 ++++++++ test/Jamfile | 8 +++++++- 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/build.jam b/build.jam index 30af6dd08f..f3036ec0a5 100644 --- a/build.jam +++ b/build.jam @@ -5,9 +5,6 @@ require-b2 5.2 ; -import-search /boost/config/checks ; -import config : requires ; - constant boost_dependencies : /boost/algorithm//boost_algorithm /boost/any//boost_any @@ -41,22 +38,12 @@ constant boost_dependencies : /boost/variant//boost_variant /boost/variant2//boost_variant2 ; -project /boost/geometry - : common-requirements - include - : requirements - [ requires - cxx14_constexpr - cxx14_return_type_deduction - ] - msvc:on - ; +project /boost/geometry ; explicit - [ alias boost_geometry : : : : $(boost_dependencies) ] + [ alias boost_geometry : : : : include $(boost_dependencies) ] [ alias all : boost_geometry test example doc/src/examples index extensions ] ; call-if : boost-library geometry ; - diff --git a/doc/src/examples/Jamfile b/doc/src/examples/Jamfile index 8fbe26c603..5327df26ea 100644 --- a/doc/src/examples/Jamfile +++ b/doc/src/examples/Jamfile @@ -9,9 +9,17 @@ # http://www.boost.org/LICENSE_1_0.txt) +import-search /boost/config/checks ; +import config : requires ; + project boost-geometry-doc-src-example : requirements /boost/geometry//boost_geometry + 14 + [ requires + cxx14_constexpr + cxx14_return_type_deduction + ] ; exe quick_start : quick_start.cpp ; diff --git a/example/Jamfile b/example/Jamfile index c2d7f11512..349999d4c0 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -10,10 +10,18 @@ # http://www.boost.org/LICENSE_1_0.txt) +import-search /boost/config/checks ; +import config : requires ; + project boost-geometry-example : requirements /boost/geometry//boost_geometry /boost/foreach//boost_foreach + 14 + [ requires + cxx14_constexpr + cxx14_return_type_deduction + ] ; exe 01_point_example : 01_point_example.cpp ; diff --git a/include/boost/geometry/srs/projections/code.hpp b/include/boost/geometry/srs/projections/code.hpp index 8f03899564..5429df86d1 100644 --- a/include/boost/geometry/srs/projections/code.hpp +++ b/include/boost/geometry/srs/projections/code.hpp @@ -11,6 +11,7 @@ #define BOOST_GEOMETRY_PROJECTIONS_CODE_HPP +#include #include #include diff --git a/index/Jamfile b/index/Jamfile index c01a4263b9..9b8bb26b93 100644 --- a/index/Jamfile +++ b/index/Jamfile @@ -8,10 +8,18 @@ # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +import-search /boost/config/checks ; +import config : requires ; + project boost-geometry-index : requirements /boost/geometry//boost_geometry + 14 + [ requires + cxx14_constexpr + cxx14_return_type_deduction + ] msvc:on ; diff --git a/test/Jamfile b/test/Jamfile index 01d7f16249..cda16411dd 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -14,11 +14,18 @@ import os ; import testing ; +import-search /boost/config/checks ; +import config : requires ; project boost-geometry-test : requirements /boost/geometry//boost_geometry + 14 + [ requires + cxx14_constexpr + cxx14_return_type_deduction + ] . msvc:on msvc:/bigobj @@ -55,4 +62,3 @@ build-project util ; build-project views ; } -