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

install mapbox variant - followup to #3236

Browse source
This commit is contained in:
Dane Springmeyer 2016-01-14 14:09:32 -08:00
parent 9c4085c8b1
commit 03285f60b0
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
deps/mapnik/build.py vendored
View file

@ -4,14 +4,15 @@ from glob import glob
Import('env') Import('env')
subdirs = { subdirs = {
'sparsehash':'sparsehash', './sparsehash':{'dir':'sparsehash','glob':'*'},
'sparsehash/internal':'sparsehash/internal', './sparsehash/internal':{'dir':'sparsehash/internal','glob':'*'},
'../agg/include':'agg', '../agg/include':{'dir':'agg','glob':'agg*'},
'../mapbox':{'dir':'mapbox/variant','glob':'*/*.hpp'}
} }
if 'install' in COMMAND_LINE_TARGETS: if 'install' in COMMAND_LINE_TARGETS:
for k,v in subdirs.items(): for k,v in subdirs.items():
pathdir = os.path.join(k,'*') pathdir = os.path.join(k,v['glob'])
includes = glob(pathdir) includes = glob(pathdir)
inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/'+v) inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/'+v['dir'])
env.Alias(target='install', source=env.Install(inc_target, includes)) env.Alias(target='install', source=env.Install(inc_target, includes))

2
utils/mapnik-config/build.py
View file

@ -63,7 +63,7 @@ CONFIG_MAPNIK_LIBNAME='%(mapnik_libname)s'
CONFIG_MAPNIK_LIBPATH="%(mapnik_libpath)s" CONFIG_MAPNIK_LIBPATH="%(mapnik_libpath)s"
CONFIG_DEP_LIBS='%(dep_libs)s' CONFIG_DEP_LIBS='%(dep_libs)s'
CONFIG_MAPNIK_LDFLAGS="%(ldflags)s" CONFIG_MAPNIK_LDFLAGS="%(ldflags)s"
CONFIG_MAPNIK_INCLUDE="${CONFIG_PREFIX}/include -I${CONFIG_PREFIX}/include/mapnik/agg" CONFIG_MAPNIK_INCLUDE="${CONFIG_PREFIX}/include -I${CONFIG_PREFIX}/include/mapnik/agg -I${CONFIG_PREFIX}/include/mapnik"
CONFIG_DEP_INCLUDES="%(dep_includes)s" CONFIG_DEP_INCLUDES="%(dep_includes)s"
CONFIG_CXXFLAGS="%(cxxflags)s" CONFIG_CXXFLAGS="%(cxxflags)s"
CONFIG_CXX='%(cxx)s' CONFIG_CXX='%(cxx)s'