Skip to content

Commit ec297bf

Browse files
authored
Merge pull request #109 from grafikrobot/modular
Add support for modular build structure.
2 parents 31de927 + 3a5e8f4 commit ec297bf

File tree

5 files changed

+37
-6
lines changed

5 files changed

+37
-6
lines changed

Diff for: build.jam

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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/assert//boost_assert
10+
/boost/config//boost_config
11+
/boost/core//boost_core
12+
/boost/io//boost_io
13+
/boost/preprocessor//boost_preprocessor
14+
/boost/throw_exception//boost_throw_exception
15+
/boost/type_traits//boost_type_traits ;
16+
17+
project /boost/utility
18+
: common-requirements
19+
<include>include
20+
;
21+
22+
explicit
23+
[ alias boost_utility : : : : <library>$(boost_dependencies) ]
24+
[ alias all : boost_utility test ]
25+
;
26+
27+
call-if : boost-library utility
28+
;
29+

Diff for: doc/Jamfile.v2

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import quickbook ;
88

99
project boost/libs/utility/doc ;
1010

11-
path-constant INCLUDES : ../../.. ;
11+
path-constant INCLUDES : ../include ;
1212
path-constant boost-images : ../../../doc/src/images ;
1313

1414
# Generate XML doxygen reference for base_from_member component in base_from_member_reference.xml

Diff for: identity_type/doc/Jamfile.v2

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import quickbook ;
99
using boostbook ;
1010

11-
doxygen reference : ../../../../boost/utility/identity_type.hpp
11+
doxygen reference : ../../include/boost/utility/identity_type.hpp
1212
: <reftitle>"Reference"
1313
<doxygen:param>PREDEFINED="DOXYGEN"
1414
<doxygen:param>QUIET=YES

Diff for: test/Jamfile.v2

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
# bring in rules for testing
99
import testing ;
1010

11+
project : requirements <library>/boost/utility//boost_utility ;
12+
1113
run base_from_member_test.cpp ;
1214
run base_from_member_ref_test.cpp ;
1315

1416
run binary_test.cpp ;
1517

16-
run call_traits_test.cpp : -u ;
18+
run call_traits_test.cpp : -u : : <library>/boost/type_traits//testing ;
1719

1820
run compressed_pair_test.cpp ;
1921
run compressed_pair_final_test.cpp ;
@@ -31,7 +33,7 @@ run string_ref_test2.cpp ;
3133
run string_ref_test_io.cpp ;
3234
# compile-fail string_view_from_rvalue.cpp ;
3335
compile string_view_constexpr_test1.cpp ;
34-
run string_view_test1.cpp ;
36+
run string_view_test1.cpp : : : <library>/boost/container_hash//boost_container_hash ;
3537
run string_view_test2.cpp ;
3638
run string_view_test_io.cpp ;
3739

Diff for: test/call_traits_test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <typeinfo>
1919
#include <boost/call_traits.hpp>
2020

21-
#include <libs/type_traits/test/test.hpp>
22-
#include <libs/type_traits/test/check_type.hpp>
21+
// type_traits/test utilities
22+
#include "check_type.hpp"
2323

2424
#ifdef BOOST_MSVC
2525
#pragma warning(disable:4181) // : warning C4181: qualifier applied to reference type; ignored

0 commit comments

Comments
 (0)