mirror of
https://github.com/boostorg/boost.git
synced 2026-07-20 13:52:13 +00:00
fix installing CMake configs (#1140)
This commit is contained in:
committed by
Peter Dimov
parent
559de72f9a
commit
6721a6d38d
@@ -406,7 +406,8 @@ rule boost-lib ( name : sources * : requirements * : default-build * : usage-req
|
||||
|
||||
# Declare special top-level targets that build and install the desired variants
|
||||
# of the libraries.
|
||||
boostcpp.declare-targets $(all-libraries-to-build) ;
|
||||
boostcpp.declare-targets $(all-libraries-modular-build) :
|
||||
$(all-libraries-to-build) ;
|
||||
|
||||
# Declare a Boost library and run related declaration rules. This should be
|
||||
# called from the libroot/build.jam to define the components of a Boost lib.
|
||||
|
||||
+10
-19
@@ -589,37 +589,28 @@ rule libraries-to-install ( existing-libs * )
|
||||
}
|
||||
}
|
||||
|
||||
rule declare-targets ( all-libraries * )
|
||||
rule declare-targets ( modular-libraries * : compiled-libraries * )
|
||||
{
|
||||
if ! predef in $(all-libraries)
|
||||
{
|
||||
all-libraries += predef ;
|
||||
}
|
||||
|
||||
configure.register-components $(all-libraries) ;
|
||||
configure.register-components $(compiled-libraries) ;
|
||||
|
||||
# Select the libraries to install.
|
||||
libraries = [ libraries-to-install $(all-libraries) ] ;
|
||||
configure.components-building $(libraries) ;
|
||||
local filtered = [ libraries-to-install $(compiled-libraries) ] ;
|
||||
configure.components-building $(filtered) ;
|
||||
|
||||
if [ option.get "show-libraries" : : true ]
|
||||
{
|
||||
ECHO The following libraries require building\: ;
|
||||
for local l in $(libraries)
|
||||
for local l in $(filtered)
|
||||
{
|
||||
if $(l) = function_types
|
||||
{
|
||||
continue ;
|
||||
}
|
||||
if [ path.glob $(BOOST_ROOT)/libs/$(l)/build : Jamfile Jamfile.v2 ]
|
||||
{
|
||||
echo " - $(l)" ;
|
||||
}
|
||||
echo " - $(l)" ;
|
||||
}
|
||||
EXIT ;
|
||||
}
|
||||
|
||||
declare_top_level_targets $(libraries) ;
|
||||
local header-only-modular = [ set.difference $(modular-libraries) :
|
||||
$(compiled-libraries) ] ;
|
||||
|
||||
declare_top_level_targets $(filtered) $(header-only-modular) ;
|
||||
}
|
||||
|
||||
# Returns the properties identifying the toolset. We'll use them
|
||||
|
||||
Reference in New Issue
Block a user