boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-02 08:42:13 +00:00
Code Issues Projects Releases Wiki Activity

Allow

Browse Source 
lib z jpeg : : <search>x ;

to work. Previously, this would complain that you specify requirements
together with multiple names.


[SVN r27059]
This commit is contained in:
Vladimir Prus
2005-02-03 15:32:56 +00:00
parent 80cbd6a94c
commit 9802d38cfd
1 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/tools/builtin.jam
View File

@@ -358,37 +358,32 @@ rule lib ( names + : sources * : requirements * : default-build *
# This is a circular module dependency, so it must be imported here
import targets ;
local result ;
if ! $(sources) && ! $(requirements)
&& ! $(default-build) && ! $(usage-requirements)
if $(names[2])
{
for local name in $(names)
{
result += [
targets.main-target-alternative
[ new typed-target $(name) : $(project) : LIB
:
: [ targets.main-target-requirements $(requirements) <name>$(name) :
$(project) ]
: [ targets.main-target-default-build $(default-build) : $(project) ]
: [ targets.main-target-usage-requirements $(usage-requirements) : $(project) ]
] ] ;
}
}
else
{
if $(names[2])
if <name> in $(requirements:G)
{
errors.user-error "When several names are given to the 'lib' rule" :
"it's not allowed to specify sources or requirements. " ;
}
local name = $(names[1]) ;
result = [ targets.main-target-alternative
"it's not allowed to specify the <name> feature. " ;
}
if $(sources)
{
errors.user-error "When several names are given to the 'lib' rule" :
"it's not allowed to specify sources. " ;
}
}
for local name in $(names)
{
local r = $(requirements) ;
if $(names[2])
{
r += <name>$(name) ;
}
result += [ targets.main-target-alternative
[ new typed-target $(name) : $(project) : LIB
: [ targets.main-target-sources $(sources) : $(name) ]
: [ targets.main-target-requirements $(requirements) : $(project) ]
: [ targets.main-target-requirements $(r) : $(project) ]
: [ targets.main-target-default-build $(default-build) : $(project) ]
: [ targets.main-target-usage-requirements $(usage-requirements) : $(project) ]
] ] ;