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

ensure agg headers are always installed

Browse source
This commit is contained in:
Dane Springmeyer 2013-02-08 17:22:17 -08:00
parent 9520f58c5a
commit 3c59eba780
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
deps/agg/build.py vendored
View file

@ -29,11 +29,4 @@ if env['SUNCC']:
else:
cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
agg_env.StaticLibrary('agg', glob('./src/' + '*.cpp'), LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS'])
if 'install' in COMMAND_LINE_TARGETS:
inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/agg')
# TODO - restrict to just agg headers used in mapnik includes?
includes = glob('./include/*.h')
target = env.Install(inc_target, includes)
env.Alias(target='install', source=target)
agg_env.StaticLibrary('agg', glob('./src/' + '*.cpp'), LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS'])

12
deps/mapnik/build.py vendored
View file

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