Skip to content

Commit

Permalink
Merge branch 'grafikrobot-modular' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
igaztanaga committed Aug 18, 2024
2 parents 5a67b76 + fc83819 commit ab7ee83
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 12 deletions.
11 changes: 0 additions & 11 deletions Jamfile

This file was deleted.

25 changes: 25 additions & 0 deletions build.jam
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# 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/move//boost_move ;

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

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

call-if : boost-library intrusive
;

2 changes: 1 addition & 1 deletion doc/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ path-constant here : . ;

doxygen autodoc
:
[ glob ../../../boost/intrusive/*.hpp ]
[ glob ../include/boost/intrusive/*.hpp ]
:
<doxygen:param>EXTRACT_ALL=NO
<doxygen:param>HIDE_UNDOC_MEMBERS=YES
Expand Down
3 changes: 3 additions & 0 deletions example/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
# Boost Software License, Version 1.0. (See accompanying file
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

import testing ;

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

Expand Down
4 changes: 4 additions & 0 deletions test/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ rule test_all
: # test-files
: # requirements
<host-os>windows,<toolset>clang:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
<library>/boost/core//boost_core
<library>/boost/container//boost_container
<library>/boost/container_hash//boost_container_hash
<library>/boost/type_traits//boost_type_traits
] ;
}

Expand Down

0 comments on commit ab7ee83

Please sign in to comment.