From 80559fffd3d941a8c751a697b706f0677c063247 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Fri, 21 Nov 2003 14:24:24 +0000 Subject: [PATCH] * build/property.jam (refine): Pass conditional properties throught. [SVN r20900] --- v2/build/property.jam | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/v2/build/property.jam b/v2/build/property.jam index 80ce019e1..4dd0aedec 100644 --- a/v2/build/property.jam +++ b/v2/build/property.jam @@ -35,9 +35,14 @@ rule refine ( properties * : requirements * ) } for local p in $(properties) - { + { # No processing for free properties - if free in [ feature.attributes $(p:G) ] + if [ MATCH (:) : $(p:G=) ] + { + # Skip conditional properties + result += $(p) ; + } + else if free in [ feature.attributes $(p:G) ] { result += $(p) ; } @@ -68,7 +73,7 @@ rule refine ( properties * : requirements * ) { __require__$(r:G) = ; } - + if $(error) { return $(error) ;