Skip to content

Commit

Permalink
Add support for modular build structure. (#29)
Browse files Browse the repository at this point in the history
This is part of the effort to make the Boost libraries "modular" for build and consumption. See https://lists.boost.org/Archives/boost/2024/01/255704.php and https://github.com/grafikrobot/boost-b2-modular/blob/b2-modular/README.adoc for more information.

This PR depends on the following other PRs being merged to both develop and master branches of the respective repos:

- boostorg/boost#854

This PR will be changed to ready for review, i.e. not draft, when the above are merged. Do not merge this one until that time.
  • Loading branch information
grafikrobot authored Aug 24, 2024
1 parent aee5309 commit 436e299
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 7 deletions.
26 changes: 26 additions & 0 deletions build.jam
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copyright René Ferdinand Rivera Morell 2023-2024
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

require-b2 5.2 ;

constant boost_dependencies :
/boost/assert//boost_assert
/boost/config//boost_config
/boost/throw_exception//boost_throw_exception
/boost/type_index//boost_type_index ;

project /boost/any
: common-requirements
<include>include
;

explicit
[ alias boost_any : : : : <library>$(boost_dependencies) ]
[ alias all : boost_any test ]
;

call-if : boost-library any
;

4 changes: 2 additions & 2 deletions doc/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ local doxygen_params =

doxygen autodoc_any
:
[ glob ../../../boost/any.hpp ]
[ glob ../../../boost/any/*.hpp ]
[ glob ../include/boost/any.hpp ]
[ glob ../include/boost/any/*.hpp ]
:
$(doxygen_params)
<xsl:param>"boost.doxygen.reftitle=Reference Section of Boost.Any"
Expand Down
11 changes: 7 additions & 4 deletions test/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,33 @@
# For more information, see http://www.boost.org/libs/any
#

build-project unique_any ;
require-b2 5.0.1 ;
import-search /boost/config/checks ;
import config : requires ;

import ../../config/checks/config : requires ;
build-project unique_any ;

import testing ;

project
: source-location .
: requirements
<library>/boost/any//boost_any
[ requires cxx11_rvalue_references cxx11_static_assert ]
;

test-suite any :
[ run any_test.cpp ]
[ run any_test.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : any_test_no_rtti ]
[ run any_test_rv.cpp ]
[ run any_test_rv.cpp : : : ]
[ run any_test_rv.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : any_test_rv_no_rtti ]
[ run any_test_mplif.cpp ]
[ compile-fail any_cast_cv_failed.cpp ]
[ compile-fail any_test_temporary_to_ref_failed.cpp ]
[ compile-fail any_test_cv_to_rv_failed.cpp ]
[ run basic_any_test.cpp ]
[ run basic_any_test.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : basic_any_test_no_rtti ]
[ run basic_any_test_rv.cpp ]
[ run basic_any_test_rv.cpp : : : ]
[ run basic_any_test_rv.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : basic_any_test_rv_no_rtti ]
[ run basic_any_test_mplif.cpp ]
[ run basic_any_test_large_object.cpp ]
Expand Down
4 changes: 3 additions & 1 deletion test/unique_any/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#
# For more information, see http://www.boost.org/libs/any

import ../../config/checks/config : requires ;
require-b2 5.0.1 ;
import-search /boost/config/checks ;
import config : requires ;

import testing ;

Expand Down

0 comments on commit 436e299

Please sign in to comment.