/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2026 by jfenwick, Tue Nov 11 01:56:54 2008 UTC revision 2038 by ksteube, Fri Nov 14 00:12:58 2008 UTC
# Line 172  if env["CC"] == "icc": Line 172  if env["CC"] == "icc":
172    fatalwarning      = ""        # Switch to turn warnings into errors    fatalwarning      = ""        # Switch to turn warnings into errors
173  elif env["CC"] == "gcc":  elif env["CC"] == "gcc":
174    # GNU C on any system    # GNU C on any system
175    cc_flags      = "-Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER -isystem /usr/include/boost/ -isystem /usr/include/python2.5/ -Wno-sign-compare"    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER -isystem " + env['boost_path'] + " -isystem " + env['python_path'] + " -Wno-sign-compare -Wno-system-headers -Wno-strict-aliasing"
176    #the strict aliasing warning is triggered by some type punning in the boost headers for version 1.34
177    #isystem does not seem to prevent this
178    cc_optim      = "-O3"    cc_optim      = "-O3"
179    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
180    omp_optim     = ""    omp_optim     = ""
# Line 191  elif env["CC"] == "cl": Line 193  elif env["CC"] == "cl":
193    pedantic      = ""    pedantic      = ""
194    fatalwarning      = ""    fatalwarning      = ""
195  elif env["CC"] == "icl":  elif env["CC"] == "icl":
196    # intel C on Windows, see windows_msvc71_options.py for a start    # intel C on Windows, see windows_intelc_options.py for a start
197    pedantic      = ""    pedantic      = ""
198    fatalwarning      = ""    fatalwarning      = ""
199    
# Line 263  env.Append(CPPPATH     = [Dir('include')]) Line 265  env.Append(CPPPATH     = [Dir('include')])
265  # Add cc option -L<Escript>/trunk/lib  # Add cc option -L<Escript>/trunk/lib
266  env.Append(LIBPATH      = [Dir(env['libinstall'])])  env.Append(LIBPATH      = [Dir(env['libinstall'])])
267    
 env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS', 'FINLEY_EXPORTS'])  
   
268  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])
269  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])
270    
# Line 571  env.Append(BUILDERS = {'RunPyUnitTest' : Line 571  env.Append(BUILDERS = {'RunPyUnitTest' :
571    
572  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
573    
574  Export(["env", "env_mpi", "clone_env"])  Export(
575      ["env",
576       "env_mpi",
577       "clone_env",
578       "IS_WINDOWS_PLATFORM"
579       ]
580      )
581    
582  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)
583  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)

Legend:
Removed from v.2026  
changed lines
  Added in v.2038

  ViewVC Help
Powered by ViewVC 1.1.26