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

scons:reformat the custom boost and mapnik version checking cpp snippets, since on gcc 4.1.1 the existing formatting was causing 'no newline at end of file' warnings

Browse source
This commit is contained in:
Dane Springmeyer 2009-02-24 18:05:22 +00:00
parent af3fa7dc76
commit feb3f3327c
1 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
SConstruct
View file

@ -296,12 +296,14 @@ def CheckBoost(context, version, silent=False):
if not silent: if not silent:
context.Message('Checking for Boost version >= %s... ' % (version)) context.Message('Checking for Boost version >= %s... ' % (version))
ret = context.TryRun(""" ret = context.TryRun("""
#include <boost/version.hpp> #include <boost/version.hpp>
int main() int main()
{ {
return BOOST_VERSION >= %d ? 0 : 1; return BOOST_VERSION >= %d ? 0 : 1;
} }
""" % version_n, '.cpp')[0] """ % version_n, '.cpp')[0]
if silent: if silent:
context.did_show_result=1 context.did_show_result=1
@ -310,14 +312,17 @@ def CheckBoost(context, version, silent=False):
def GetBoostLibVersion(context): def GetBoostLibVersion(context):
ret = context.TryRun(""" ret = context.TryRun("""
#include <boost/version.hpp> #include <boost/version.hpp>
#include <iostream> #include <iostream>
int main() int main()
{ {
std::cout << BOOST_LIB_VERSION << std::endl; std::cout << BOOST_LIB_VERSION << std::endl;
return 0; return 0;
} }
""", '.cpp') """, '.cpp')
# hack to avoid printed output # hack to avoid printed output
context.did_show_result=1 context.did_show_result=1
@ -326,6 +331,7 @@ def GetBoostLibVersion(context):
def GetMapnikLibVersion(context): def GetMapnikLibVersion(context):
ret = context.TryRun(""" ret = context.TryRun("""
#include <mapnik/version.hpp> #include <mapnik/version.hpp>
#include <iostream> #include <iostream>
@ -334,6 +340,7 @@ def GetMapnikLibVersion(context):
std::cout << MAPNIK_VERSION << std::endl; std::cout << MAPNIK_VERSION << std::endl;
return 0; return 0;
} }
""", '.cpp') """, '.cpp')
# hack to avoid printed output # hack to avoid printed output
context.did_show_result=1 context.did_show_result=1