Fix a bug that would switch to the wrong BOOST_APPEND if one of the boost libs is missing.
We now make sure the first one, and only the first one, found is the reference for the BOOST_APPEND.
This commit is contained in:
parent
9f8460fb0b
commit
b246133a2b
1 changed files with 2 additions and 2 deletions
|
@ -85,9 +85,9 @@ for libinfo in C_LIBSHEADERS:
|
||||||
|
|
||||||
env['BOOST_APPEND'] = ''
|
env['BOOST_APPEND'] = ''
|
||||||
|
|
||||||
for libinfo in BOOST_LIBSHEADERS:
|
for count, libinfo in enumerate(BOOST_LIBSHEADERS):
|
||||||
if not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0], env['BOOST_APPEND']), libinfo[1], 'C++'):
|
if not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0], env['BOOST_APPEND']), libinfo[1], 'C++'):
|
||||||
if not conf.CheckLibWithHeader('boost_%s-%s-mt' % (libinfo[0], env['CC']), libinfo[1], 'C++') and libinfo[2]:
|
if not conf.CheckLibWithHeader('boost_%s-%s-mt' % (libinfo[0], env['CC']), libinfo[1], 'C++') and libinfo[2] and count == 0:
|
||||||
print 'Could not find header or shared library for boost %s, exiting!' % libinfo[0]
|
print 'Could not find header or shared library for boost %s, exiting!' % libinfo[0]
|
||||||
Exit(1)
|
Exit(1)
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Add table
Reference in a new issue