Skip to content

Commit cf7d2d2

Browse files
authored
Merge pull request #151 from grafikrobot/modular
Add support for modular build structure.
2 parents 1d124e8 + 6cd17cb commit cf7d2d2

File tree

2 files changed

+47
-6
lines changed

2 files changed

+47
-6
lines changed

build.jam

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Copyright René Ferdinand Rivera Morell 2023-2024
2+
# Distributed under the Boost Software License, Version 1.0.
3+
# (See accompanying file LICENSE_1_0.txt or copy at
4+
# http://www.boost.org/LICENSE_1_0.txt)
5+
6+
require-b2 5.2 ;
7+
8+
constant boost_dependencies :
9+
/boost/array//boost_array
10+
/boost/assert//boost_assert
11+
/boost/concept_check//boost_concept_check
12+
/boost/config//boost_config
13+
/boost/container_hash//boost_container_hash
14+
/boost/conversion//boost_conversion
15+
/boost/core//boost_core
16+
/boost/detail//boost_detail
17+
/boost/iterator//boost_iterator
18+
/boost/mpl//boost_mpl
19+
/boost/optional//boost_optional
20+
/boost/preprocessor//boost_preprocessor
21+
/boost/regex//boost_regex
22+
/boost/static_assert//boost_static_assert
23+
/boost/tuple//boost_tuple
24+
/boost/type_traits//boost_type_traits
25+
/boost/utility//boost_utility ;
26+
27+
project /boost/range
28+
;
29+
30+
explicit
31+
[ alias boost_range : : :
32+
: <include>include <library>$(boost_dependencies) ]
33+
[ alias all : boost_range test ]
34+
;
35+
36+
call-if : boost-library range
37+
;

test/Jamfile.v2

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,23 @@ import testing ;
1414

1515
project
1616
: requirements
17-
<library>/boost/test//boost_unit_test_framework/
18-
<library>/boost/regex//boost_regex/
17+
<library>/boost/assign//boost_assign
18+
<library>/boost/foreach//boost_foreach
19+
<library>/boost/lambda//boost_lambda
20+
<library>/boost/regex//boost_regex/<link>static
21+
<library>/boost/test//boost_unit_test_framework
22+
<library>/boost/variant//boost_variant
1923
<link>static
2024
<threading>multi
2125
;
2226

23-
rule range-test ( name : includes * )
27+
rule range-test ( name : requirements * )
2428
{
2529
return [
26-
run $(name).cpp /boost/test//boost_unit_test_framework /boost/regex//boost_regex/<link>static
30+
run $(name).cpp
2731
:
2832
:
29-
: <toolset>gcc:<cxxflags>"-Wall -Wunused "
33+
: <toolset>gcc:<cxxflags>"-Wall -Wunused " $(requirements)
3034
] ;
3135
}
3236

@@ -67,7 +71,7 @@ test-suite range :
6771
[ range-test adaptor_test/sliced ]
6872
[ range-test adaptor_test/strided ]
6973
[ range-test adaptor_test/strided2 ]
70-
[ range-test adaptor_test/ticket_6742_transformed_c4789_warning ]
74+
[ range-test adaptor_test/ticket_6742_transformed_c4789_warning : <library>/boost/phoenix//boost_phoenix ]
7175
[ range-test adaptor_test/ticket_8676_sliced_transformed ]
7276
[ range-test adaptor_test/ticket_9519_strided_reversed ]
7377
[ range-test adaptor_test/tokenized ]

0 commit comments

Comments
 (0)