sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scons: be more aggressive about searching for boost lib naming if 'append' is not specified - improves upon r1200 (#297)

Browse source
This commit is contained in:
Dane Springmeyer 2009-07-22 01:31:35 +00:00
parent 85ecc33d7f
commit ae819defad
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
SConstruct
View file

@ -372,7 +372,9 @@ def FindBoost(context, prefixes):
BOOST_INCLUDE_DIR = None BOOST_INCLUDE_DIR = None
BOOST_APPEND = None BOOST_APPEND = None
env['BOOST_APPEND'] = str() env['BOOST_APPEND'] = str()
prefixes.insert(0,os.path.dirname(env['BOOST_INCLUDES']))
prefixes.insert(0,os.path.dirname(env['BOOST_LIBS']))
for searchDir in prefixes: for searchDir in prefixes:
libItems = glob(os.path.join(searchDir, LIBDIR_SCHEMA, 'libboost_filesystem*-*.*')) libItems = glob(os.path.join(searchDir, LIBDIR_SCHEMA, 'libboost_filesystem*-*.*'))
if not libItems: if not libItems:
@ -389,22 +391,18 @@ def FindBoost(context, prefixes):
msg = str() msg = str()
if not env['BOOST_LIBS']: if BOOST_LIB_DIR:
if BOOST_LIB_DIR: msg += '\n *libs found: %s' % BOOST_LIB_DIR
msg += '\n *libs found: %s' % BOOST_LIB_DIR env['BOOST_LIBS'] = BOOST_LIB_DIR
env['BOOST_LIBS'] = BOOST_LIB_DIR
else:
env['BOOST_LIBS'] = '/usr' + LIBDIR_SCHEMA
else: else:
env['BOOST_LIBS'] = '/usr' + LIBDIR_SCHEMA
msg += '\n *using boost lib dir: %s' % env['BOOST_LIBS'] msg += '\n *using boost lib dir: %s' % env['BOOST_LIBS']
if not env['BOOST_INCLUDES']: if BOOST_INCLUDE_DIR:
if BOOST_INCLUDE_DIR: msg += '\n *headers found: %s' % BOOST_INCLUDE_DIR
msg += '\n *headers found: %s' % BOOST_INCLUDE_DIR env['BOOST_INCLUDES'] = BOOST_INCLUDE_DIR
env['BOOST_INCLUDES'] = BOOST_INCLUDE_DIR
else:
env['BOOST_INCLUDES'] = '/usr/include'
else: else:
env['BOOST_INCLUDES'] = '/usr/include'
msg += '\n *using boost include dir: %s' % env['BOOST_INCLUDES'] msg += '\n *using boost include dir: %s' % env['BOOST_INCLUDES']
if not env['BOOST_TOOLKIT'] and not env['BOOST_ABI'] and not env['BOOST_VERSION']: if not env['BOOST_TOOLKIT'] and not env['BOOST_ABI'] and not env['BOOST_VERSION']: