/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2036 by jfenwick, Thu Nov 13 04:35:06 2008 UTC revision 2054 by phornby, Mon Nov 17 13:20:41 2008 UTC
# Line 128  opts.AddOptions( Line 128  opts.AddOptions(
128    ('blas_lib_path', 'Path to BLAS libs', usr_lib),    ('blas_lib_path', 'Path to BLAS libs', usr_lib),
129    ('blas_libs', 'BLAS libraries to link with', ['blas']),    ('blas_libs', 'BLAS libraries to link with', ['blas']),
130  # An option for specifying the compiler tools set (see windows branch).  # An option for specifying the compiler tools set (see windows branch).
131    ('tools_names', 'allow control over the tools in the env setup', ['intelc'])    ('tools_names', 'allow control over the tools in the env setup', ['intelc']),
132    # finer control over library building, intel aggressive global optimisation
133    # works with dynamic libraries on windows.
134      ('share_esysUtils', 'control static or dynamic esysUtils lib', False),
135      ('share_paso', 'control static or dynamic paso lib', False)
136  )  )
137    
138  ############ Specify which compilers to use ####################  ############ Specify which compilers to use ####################
# Line 172  if env["CC"] == "icc": Line 176  if env["CC"] == "icc":
176    fatalwarning      = ""        # Switch to turn warnings into errors    fatalwarning      = ""        # Switch to turn warnings into errors
177  elif env["CC"] == "gcc":  elif env["CC"] == "gcc":
178    # GNU C on any system    # GNU C on any system
179    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER -isystem /usr/include/boost/ -isystem /usr/include/python2.5/ -Wno-sign-compare -Wno-system-headers -Wno-strict-aliasing"    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"
180  #the strict aliasing warning is triggered by some type punning in the boost headers for version 1.34  #the strict aliasing warning is triggered by some type punning in the boost headers for version 1.34
181  #isystem does not seem to prevent this  #isystem does not seem to prevent this
182    cc_optim      = "-O3"    cc_optim      = "-O3"
# Line 274  if env['usepedantic']: env.Append(CCFLAG Line 278  if env['usepedantic']: env.Append(CCFLAG
278  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
279    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.PrependENVPath('PATH',    [env['boost_lib_path']])
280    env.PrependENVPath('PATH',    [env['libinstall']])    env.PrependENVPath('PATH',    [env['libinstall']])
281      if not env['share_esysUtils'] :
282        env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
283      if not env['share_paso'] :
284        env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
285    
286    if env['usenetcdf']:    if env['usenetcdf']:
287      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])
288    

Legend:
Removed from v.2036  
changed lines
  Added in v.2054

  ViewVC Help
Powered by ViewVC 1.1.26