boostorg/predef
1
0
Fork 1
mirror of https://github.com/boostorg/predef.git synced 2025-07-29 11:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from boostorg/develop

Browse Source 
Fix test build script to also work in non-modular release archive.
This commit is contained in:
Rene Rivera
2014-07-10 08:53:53 -05:00
parent d98e1e6337 4a4c6e630e
commit 4d5d6d148f
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/build.jam
View File

@ -7,23 +7,33 @@
local predef-include-root ; local predef-include-root ;
local predef-dependency ; local predef-dependency ;
local modular-predef-h = [ glob $(BOOST_PREDEF_ROOT)/include/boost/predef.h ] ;
local BOOST_RELEASE_LAYOUT ;
if ! $(modular-predef-h)
{
BOOST_RELEASE_LAYOUT = yes ;
}
# When using modular layout, header files are not present in $root/boost # When using modular layout, header files are not present in $root/boost
# unlink links are created, therefore instead of direct dependency on # unlink links are created, therefore instead of direct dependency on
# a header, we need to use dependency on metatarget. # a header, we need to use dependency on metatarget.
if $(BOOST_PREDEF_ROOT) if $(BOOST_RELEASE_LAYOUT)
{
predef-dependency = $(predef-include-root)/boost/predef.h ;
}
else if $(BOOST_PREDEF_ROOT)
{ {
predef-include-root = $(BOOST_PREDEF_ROOT)/include ; predef-include-root = $(BOOST_PREDEF_ROOT)/include ;
predef-dependency = $(predef-include-root)/boost/predef.h ; predef-dependency = $(predef-include-root)/boost/predef.h ;
} }
else if $(BOOST_MODULARLAYOUT) else if $(BOOST_MODULARLAYOUT)
{ {
predef-include-root = $(BOOST_ROOT)/include ; predef-include-root = $(BOOST_ROOT) ;
predef-dependency = /boost//predef-headers ; predef-dependency = /boost//predef-headers ;
} }
else else
{ {
predef-include-root = $(BOOST_ROOT) ; predef-dependency = $(predef-include-root)/boost/predef.h ;
predef-dependency = $(predef-include-root)/boost/predef.h ;
} }
project test project test