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

scons: move the mapnik version checking later in script, after local paths have been added

Browse source
This commit is contained in:
Dane Springmeyer 2009-02-17 22:48:17 +00:00
parent 75687151e8
commit 901223ef25
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
SConstruct
View file

@ -340,16 +340,6 @@ conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
'GetBoostLibVersion' : GetBoostLibVersion,
'GetMapnikLibVersion' : GetMapnikLibVersion })
# fetch the mapnik version header in order to set the
# ABI version used to build libmapnik.so on linux in src/SConscript
abi = conf.GetMapnikLibVersion()
abi_fallback = [0,6,0]
if not abi:
color_print(1,'Problem encountered parsing mapnik version (please post bug report to trac.mapnik.org), falling back to %s')
env['ABI_VERSION'] = abi_fallback
else:
env['ABI_VERSION'] = abi
#### Libraries and headers dependency checks ####
@ -390,6 +380,17 @@ else:
for required in ('BOOST', 'PNG', 'JPEG', 'TIFF','PROJ'):
add_paths(required)
# fetch the mapnik version header in order to set the
# ABI version used to build libmapnik.so on linux in src/SConscript
abi = conf.GetMapnikLibVersion()
abi_fallback = [0,6,0]
if not abi:
color_print(1,'Problem encountered parsing mapnik version (please post bug report to trac.mapnik.org), falling back to %s' % abi_fallback)
env['ABI_VERSION'] = abi_fallback
else:
env['ABI_VERSION'] = abi
requested_plugins = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])]
# Adding the required prerequisite library directories for the plugins...