mirror of
https://github.com/boostorg/boost.git
synced 2025-04-08 22:48:50 +00:00
Made installing/staging specific Boost libraries from their own folders instead of the root project folder work correctly.
- install-requirements variable was local and so was not visible in rules called from other projects, e.g. boost-install(). - header files always got searched for from the current folder instead of the root project folder. - boost-install() rule was referencing a non-existent install-headers target that got renamed to install-proper headers in revision 35986. Patch contributed by Steven Watanabe. [SVN r48492]
This commit is contained in:
parent
a18c0a493b
commit
20186872b6
1 changed files with 6 additions and 6 deletions
12
Jamroot
12
Jamroot
|
@ -345,8 +345,8 @@ rule tag ( name : type ? : property-set )
|
|||
|
||||
# Install to system location.
|
||||
|
||||
local install-requirements =
|
||||
<install-source-root>boost
|
||||
install-requirements =
|
||||
<install-source-root>$(BOOST_ROOT)/boost
|
||||
;
|
||||
if $(layout-versioned)
|
||||
{
|
||||
|
@ -366,9 +366,9 @@ else if [ modules.peek : UNIX ]
|
|||
}
|
||||
|
||||
local headers =
|
||||
[ path.glob-tree boost : *.hpp *.ipp *.h *.inc : CVS ]
|
||||
[ path.glob-tree boost/compatibility/cpp_c_headers : c* : CVS ]
|
||||
;
|
||||
[ path.glob-tree $(BOOST_ROOT)/boost : *.hpp *.ipp *.h *.inc : CVS ]
|
||||
[ path.glob-tree $(BOOST_ROOT)/boost/compatibility/cpp_c_headers : c* : CVS
|
||||
] ;
|
||||
|
||||
|
||||
# Complete install
|
||||
|
@ -486,7 +486,7 @@ alias build_all : libs/$(libraries)/build ;
|
|||
rule boost-install ( libraries * )
|
||||
{
|
||||
package.install install
|
||||
: <dependency>/boost//install-headers $(install-requirements)
|
||||
: <dependency>/boost//install-proper-headers $(install-requirements)
|
||||
: # No binaries
|
||||
: $(libraries)
|
||||
: # No headers, it's handled by the dependency
|
||||
|
|
Loading…
Add table
Reference in a new issue