Skip to content

Fix/bjam leaking cxx14 #1477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vissarion merged 2 commits into from
Jun 29, 2026
Merged

Fix/bjam leaking cxx14 #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6faa665
[extensions] Require cxx14 in Jamfile in preparation for removing it …
tinko92 Jun 28, 2026
70b4b19
Move cxx14 checks from build.jam to buildable targets to address #1460
tinko92 Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions build.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -41,22 +38,12 @@ constant boost_dependencies :
/boost/variant//boost_variant
/boost/variant2//boost_variant2 ;

project /boost/geometry
: common-requirements
<include>include
: requirements
[ requires
cxx14_constexpr
cxx14_return_type_deduction
]
<toolset>msvc:<asynch-exceptions>on
;
project /boost/geometry ;

explicit
[ alias boost_geometry : : : : <library>$(boost_dependencies) ]
[ alias boost_geometry : : : : <include>include <library>$(boost_dependencies) ]
[ alias all : boost_geometry test example doc/src/examples index extensions ]
;

call-if : boost-library geometry
;

8 changes: 8 additions & 0 deletions doc/src/examples/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
<library>/boost/geometry//boost_geometry
<cxxstd>14
[ requires
cxx14_constexpr
cxx14_return_type_deduction
]
;

exe quick_start : quick_start.cpp ;
Expand Down
8 changes: 8 additions & 0 deletions example/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
<library>/boost/geometry//boost_geometry
<library>/boost/foreach//boost_foreach
<cxxstd>14
[ requires
cxx14_constexpr
cxx14_return_type_deduction
]
;

exe 01_point_example : 01_point_example.cpp ;
Expand Down
8 changes: 8 additions & 0 deletions extensions/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
<toolset>msvc:<asynch-exceptions>on
<library>/boost/geometry//boost_geometry
<library>/boost/test//included
<cxxstd>14
[ requires
cxx14_constexpr
cxx14_return_type_deduction
]
;

build-project test ;
Expand Down
1 change: 1 addition & 0 deletions include/boost/geometry/srs/projections/code.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#define BOOST_GEOMETRY_PROJECTIONS_CODE_HPP


#include <array>
#include <cmath>

#include <boost/geometry/srs/projections/dpar.hpp>
Expand Down
8 changes: 8 additions & 0 deletions index/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
<library>/boost/geometry//boost_geometry
<cxxstd>14
[ requires
cxx14_constexpr
cxx14_return_type_deduction
]
<toolset>msvc:<asynch-exceptions>on
;

Expand Down
8 changes: 7 additions & 1 deletion test/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,18 @@

import os ;
import testing ;
import-search /boost/config/checks ;
import config : requires ;

project boost-geometry-test
:
requirements
<library>/boost/geometry//boost_geometry
<cxxstd>14
[ requires
cxx14_constexpr
cxx14_return_type_deduction
]
<include>.
<toolset>msvc:<asynch-exceptions>on
<toolset>msvc:<cxxflags>/bigobj
Expand Down Expand Up @@ -55,4 +62,3 @@ build-project util ;
build-project views ;

}

Loading