Adjustments for building tests with dynamically generated header links for modular SVN layout.

[SVN r85974]
This commit is contained in:
Rene Rivera
2013-09-27 17:22:39 +00:00
parent 5ce68f733e
commit 8931511834

View File

@ -4,19 +4,34 @@
# (See accompanying file LICENSE_1_0.txt or copy at # (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt) # http://www.boost.org/LICENSE_1_0.txt)
local predef-include-root ;
local predef-dependency ;
# When using modular layout, header files are not present in $root/boost
# unlink links are created, therefore instead of direct dependency on
# a header, we need to use dependency on metatarget.
if $(BOOST_PREDEF_ROOT) if $(BOOST_PREDEF_ROOT)
{ {
path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_PREDEF_ROOT)/include ; predef-include-root = $(BOOST_PREDEF_ROOT)/include ;
predef-dependency = $(predef-include-root)/boost/predef.h ;
}
else if $(BOOST_MODULARLAYOUT)
{
predef-include-root = $(BOOST_ROOT)/include ;
predef-dependency = /boost//predef-headers ;
} }
else else
{ {
path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_ROOT) ; predef-include-root = $(BOOST_ROOT) ;
predef-dependency = $(predef-include-root)/boost/predef.h ;
} }
project test project test
: requirements : requirements
<include>$(BOOST_PREDEF_INCLUDE_ROOT) <include>$(predef-include-root)
<dependency>$(BOOST_PREDEF_INCLUDE_ROOT)/boost/predef.h # Add explicit dependency since we don't have header scanner for
# .m and .mm files.
<dependency>$(predef-dependency)
; ;
using testing ; using testing ;