further fixup the sparsehash usage internally
This commit is contained in:
parent
805664056a
commit
6f8a12d29d
9 changed files with 17 additions and 1 deletions
|
@ -1262,6 +1262,9 @@ if not preconfigured:
|
||||||
env.Prepend(CPPPATH = '#deps/agg/include')
|
env.Prepend(CPPPATH = '#deps/agg/include')
|
||||||
env.Prepend(LIBPATH = '#deps/agg')
|
env.Prepend(LIBPATH = '#deps/agg')
|
||||||
|
|
||||||
|
# prepend deps dir for auxillary headers
|
||||||
|
env.Prepend(CPPPATH = '#deps')
|
||||||
|
|
||||||
if env['CAIRO']:
|
if env['CAIRO']:
|
||||||
if env['CAIRO_LIBS'] or env['CAIRO_INCLUDES']:
|
if env['CAIRO_LIBS'] or env['CAIRO_INCLUDES']:
|
||||||
c_inc = env['CAIRO_INCLUDES']
|
c_inc = env['CAIRO_INCLUDES']
|
||||||
|
@ -1667,7 +1670,7 @@ if not HELP_REQUESTED:
|
||||||
SConscript('include/build.py')
|
SConscript('include/build.py')
|
||||||
|
|
||||||
# Install auxiliary headers
|
# Install auxiliary headers
|
||||||
SConscript('deps/build.py')
|
SConscript('deps/mapnik/build.py')
|
||||||
|
|
||||||
# Build the requested and able-to-be-compiled input plug-ins
|
# Build the requested and able-to-be-compiled input plug-ins
|
||||||
GDAL_BUILT = False
|
GDAL_BUILT = False
|
||||||
|
|
13
deps/mapnik/build.py
vendored
Normal file
13
deps/mapnik/build.py
vendored
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
import os
|
||||||
|
from glob import glob
|
||||||
|
|
||||||
|
Import('env')
|
||||||
|
|
||||||
|
subdirs = ['sparsehash','sparsehash/internal']
|
||||||
|
|
||||||
|
if 'install' in COMMAND_LINE_TARGETS:
|
||||||
|
for subdir in subdirs:
|
||||||
|
pathdir = os.path.join(subdir,'*')
|
||||||
|
includes = glob(pathdir)
|
||||||
|
inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/'+subdir)
|
||||||
|
env.Alias(target='install', source=env.Install(inc_target, includes))
|
Loading…
Reference in a new issue