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

fix handling of the defines of optional deps when cross-compiling

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-26 15:50:35 -04:00
parent 0ac9c7f4c9
commit a4c79fc6fe
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
SConstruct
View file

@ -1327,19 +1327,19 @@ if not preconfigured:
else: else:
env['SKIPPED_DEPS'].append('boost_regex_icu') env['SKIPPED_DEPS'].append('boost_regex_icu')
if not env['HOST']:
for libname, headers, required, lang, define in OPTIONAL_LIBSHEADERS: for libname, headers, required, lang, define in OPTIONAL_LIBSHEADERS:
if not conf.CheckLibWithHeader(libname, headers, lang): if not env['HOST']:
if required: if not conf.CheckLibWithHeader(libname, headers, lang):
color_print(1, 'Could not find required header or shared library for %s' % libname) if required:
env['MISSING_DEPS'].append(libname) color_print(1, 'Could not find required header or shared library for %s' % libname)
env['MISSING_DEPS'].append(libname)
else:
color_print(4, 'Could not find optional header or shared library for %s' % libname)
env['SKIPPED_DEPS'].append(libname)
else: else:
color_print(4, 'Could not find optional header or shared library for %s' % libname) env.Append(CPPDEFINES = define)
env['SKIPPED_DEPS'].append(libname)
else: else:
env.Append(CPPDEFINES = define) env.Append(CPPDEFINES = define)
else:
env.Append(CPPDEFINES = define)
env['REQUESTED_PLUGINS'] = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])] env['REQUESTED_PLUGINS'] = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])]