/[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 2101 by gross, Wed Nov 26 08:29:08 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      = "-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'] + "/boost -isystem " + env['python_path'] + " -Wno-sign-compare -Wno-system-headers -Wno-strict-aliasing -Wno-long-long"
180    #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
182    #the long long warning occurs on the Mac
183    cc_optim      = "-O3"    cc_optim      = "-O3"
184    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
185    omp_optim     = ""    omp_optim     = ""
# Line 191  elif env["CC"] == "cl": Line 198  elif env["CC"] == "cl":
198    pedantic      = ""    pedantic      = ""
199    fatalwarning      = ""    fatalwarning      = ""
200  elif env["CC"] == "icl":  elif env["CC"] == "icl":
201    # intel C on Windows, see windows_msvc71_options.py for a start    # intel C on Windows, see windows_intelc_options.py for a start
202    pedantic      = ""    pedantic      = ""
203    fatalwarning      = ""    fatalwarning      = ""
204    
# Line 263  env.Append(CPPPATH     = [Dir('include')]) Line 270  env.Append(CPPPATH     = [Dir('include')])
270  # Add cc option -L<Escript>/trunk/lib  # Add cc option -L<Escript>/trunk/lib
271  env.Append(LIBPATH      = [Dir(env['libinstall'])])  env.Append(LIBPATH      = [Dir(env['libinstall'])])
272    
 env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS', 'FINLEY_EXPORTS'])  
   
273  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])
274  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])
275    
# Line 274  if env['usepedantic']: env.Append(CCFLAG Line 279  if env['usepedantic']: env.Append(CCFLAG
279  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
280    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.PrependENVPath('PATH',    [env['boost_lib_path']])
281    env.PrependENVPath('PATH',    [env['libinstall']])    env.PrependENVPath('PATH',    [env['libinstall']])
282      if not env['share_esysUtils'] :
283        env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
284      if not env['share_paso'] :
285        env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
286    
287    if env['usenetcdf']:    if env['usenetcdf']:
288      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])
289    
# Line 440  if env['useumfpack']: Line 450  if env['useumfpack']:
450    
451  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0
452  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0
453    if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?
454    
455  # Add UMFPACK to environment env if it was found  # Add UMFPACK to environment env if it was found
456  if env['useumfpack']:  if env['useumfpack']:
# Line 571  env.Append(BUILDERS = {'RunPyUnitTest' : Line 582  env.Append(BUILDERS = {'RunPyUnitTest' :
582    
583  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
584    
585  Export(["env", "env_mpi", "clone_env"])  Export(
586      ["env",
587       "env_mpi",
588       "clone_env",
589       "IS_WINDOWS_PLATFORM"
590       ]
591      )
592    
593  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)
594  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.2101

  ViewVC Help
Powered by ViewVC 1.1.26