Changeset 707

Timestamp:

06/29/08 07:40:35 (8 weeks ago)

Author:

artem

Message:

corrected boost libs names logic

Location:

trunk

Files:

• SConstruct (modified) (2 diffs)
• bindings/python/SConscript (modified) (2 diffs)
• plugins/input/postgis/SConscript (modified) (1 diff)
• plugins/input/shape/SConscript (modified) (1 diff)

trunk/SConstruct

@@ -155 +155 @@
 
 BOOST_LIBSHEADERS = [
-    # ['system', 'boost/system/system_error.hpp', True], # uncomment this on Darwin + boost_1_35
+    ['system', 'boost/system/system_error.hpp', True], # uncomment this on Darwin + boost_1_35
     ['filesystem', 'boost/filesystem/operations.hpp', True],
     ['regex', 'boost/regex.hpp', True],
@@ -182 +182 @@
 for count, libinfo in enumerate(BOOST_LIBSHEADERS):
     if  env['THREADING'] == 'multi' :
-        if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],env['BOOST_APPEND'],thread_suffix), libinfo[1], 'C++') and libinfo[2] :
+        if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],thread_suffix,env['BOOST_APPEND']), libinfo[1], 'C++') and libinfo[2] :
             color_print(1,'Could not find header or shared library for boost %s, exiting!' % libinfo[0])
             Exit(1)

trunk/bindings/python/SConscript

@@ -41 +41 @@
 libraries = ['mapnik','png','jpeg']
 if env['THREADING'] == 'multi':
-    libraries.append('boost_python%s%s' % (env['BOOST_APPEND'],thread_suffix))
+    libraries.append('boost_python%s%s' % (thread_suffix,env['BOOST_APPEND']))
 else :
     libraries.append('boost_python%s' % env['BOOST_APPEND'])
@@ -49 +49 @@
     libraries.append('icudata')
     if env['THREADING'] == 'multi':
-        libraries.append('boost_regex%s%s' % (env['BOOST_APPEND'],thread_suffix))
+        libraries.append('boost_regex%s%s' % (thread_suffix,env['BOOST_APPEND']))
     else :
         libraries.append('boost_regex%s' % env['BOOST_APPEND'])
     if env['THREADING'] == 'multi':
-        libraries.append('boost_thread%s%s' % (env['BOOST_APPEND'],thread_suffix))
+        libraries.append('boost_thread%s%s' % (thread_suffix,env['BOOST_APPEND']))
     if '-DHAVE_PYCAIRO' in env['CXXFLAGS']:
         libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')])

trunk/plugins/input/postgis/SConscript

@@ -39 +39 @@
     libraries.append('icudata')
     if env['THREADING'] == 'multi':
-        libraries.append('boost_thread%s-mt' % env['BOOST_APPEND'])
+        libraries.append('boost_thread-mt%s' % env['BOOST_APPEND'])
 
 postgis_inputdriver = env.SharedLibrary('postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

trunk/plugins/input/shape/SConscript

@@ -41 +41 @@
     
 if env['THREADING'] == 'multi':
-    libraries = ['boost_iostreams%s%s' % (env['BOOST_APPEND'],thread_suffix) ]
+    libraries = ['boost_iostreams%s%s' % (thread_suffix,env['BOOST_APPEND']) ]
 else:
     libraries = ['boost_iostreams%s' % (env['BOOST_APPEND']) ]