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

boost gil narrowing only impacts clang++ it appears and not g++ 4.6.3 with -std=c++0x (TODO: checkout newer g++ with -std=c++11

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-28 15:50:42 -04:00
parent 4ee91a4a25
commit 64efd5fdf2
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -1657,11 +1657,12 @@ if not preconfigured:
ndebug_defines = ['-DNDEBUG'] ndebug_defines = ['-DNDEBUG']
# c++11 support / https://github.com/mapnik/mapnik/issues/1683 # c++11 support / https://github.com/mapnik/mapnik/issues/1683
# - workaround boost gil channel_algorithm.hpp narrowing error
# - upgrade to PHOENIX_V3 since that is needed for c++11 compile # - upgrade to PHOENIX_V3 since that is needed for c++11 compile
if 'c++11' in env['CUSTOM_CXXFLAGS']: if 'c++11' in env['CUSTOM_CXXFLAGS']:
env.Append(CXXFLAGS = '-Wno-c++11-narrowing')
env.Append(CPPDEFINES = '-DBOOST_SPIRIT_USE_PHOENIX_V3=1') env.Append(CPPDEFINES = '-DBOOST_SPIRIT_USE_PHOENIX_V3=1')
# - workaround boost gil channel_algorithm.hpp narrowing error
if 'clang++' in env['CXX']:
env.Append(CXXFLAGS = '-Wno-c++11-narrowing')
# Enable logging in debug mode (always) and release mode (when specified) # Enable logging in debug mode (always) and release mode (when specified)
if env['DEFAULT_LOG_SEVERITY']: if env['DEFAULT_LOG_SEVERITY']: