Skip to content

Commit ab7ee83

Browse files
committed
Merge branch 'grafikrobot-modular' into develop
2 parents 5a67b76 + fc83819 commit ab7ee83

File tree

5 files changed

+33
-12
lines changed

5 files changed

+33
-12
lines changed

Jamfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

build.jam

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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/move//boost_move ;
12+
13+
project /boost/intrusive
14+
: common-requirements
15+
<include>include
16+
;
17+
18+
explicit
19+
[ alias boost_intrusive : : : : <library>$(boost_dependencies) ]
20+
[ alias all : boost_intrusive example test ]
21+
;
22+
23+
call-if : boost-library intrusive
24+
;
25+

doc/Jamfile.v2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ path-constant here : . ;
1818

1919
doxygen autodoc
2020
:
21-
[ glob ../../../boost/intrusive/*.hpp ]
21+
[ glob ../include/boost/intrusive/*.hpp ]
2222
:
2323
<doxygen:param>EXTRACT_ALL=NO
2424
<doxygen:param>HIDE_UNDOC_MEMBERS=YES

example/Jamfile.v2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
# Boost Software License, Version 1.0. (See accompanying file
1212
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1313

14+
import testing ;
15+
1416
# this rule enumerates through all the sources and invokes
1517
# the run rule for each source, the result is a list of all
1618
# the run rules, which we can pass on to the test_suite rule:
@@ -30,6 +32,7 @@ rule test_all
3032
<toolset>gcc,<target-os>windows:<linkflags>"-lole32 -loleaut32"
3133
<host-os>hpux,<toolset>gcc:<linkflags>"-Wl,+as,mpas"
3234
<host-os>windows,<toolset>clang:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
35+
<library>/boost/interprocess//boost_interprocess
3336
] ;
3437
}
3538

test/Jamfile.v2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ rule test_all
2525
: # test-files
2626
: # requirements
2727
<host-os>windows,<toolset>clang:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
28+
<library>/boost/core//boost_core
29+
<library>/boost/container//boost_container
30+
<library>/boost/container_hash//boost_container_hash
31+
<library>/boost/type_traits//boost_type_traits
2832
] ;
2933
}
3034

0 commit comments

Comments
 (0)