/[escript]/branches/cookbookdev/SConstruct
ViewVC logotype

Diff of /branches/cookbookdev/SConstruct

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

revision 2040 by phornby, Sat Nov 15 12:43:11 2008 UTC revision 2130 by jfenwick, Thu Dec 4 05:56:45 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 160  if env['useMPI']: env['usempi'] = 1 Line 164  if env['useMPI']: env['usempi'] = 1
164  # Default compiler options (override allowed in hostname_options.py, but should not be necessary)  # Default compiler options (override allowed in hostname_options.py, but should not be necessary)
165  # For both C and C++ you get: cc_flags and either the optim flags or debug flags  # For both C and C++ you get: cc_flags and either the optim flags or debug flags
166    
167    sysheaderopt = ""       # how do we indicate that a header is a system header. Use "" for no action.
168    
169  if env["CC"] == "icc":  if env["CC"] == "icc":
170    # Intel compilers    # Intel compilers
171    cc_flags      = "-fPIC -ansi -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"    cc_flags      = "-fPIC -ansi -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"
# Line 170  if env["CC"] == "icc": Line 176  if env["CC"] == "icc":
176    omp_libs      = ['guide', 'pthread']    omp_libs      = ['guide', 'pthread']
177    pedantic      = ""    pedantic      = ""
178    fatalwarning      = ""        # Switch to turn warnings into errors    fatalwarning      = ""        # Switch to turn warnings into errors
179      sysheaderopt      = ""
180  elif env["CC"] == "gcc":  elif env["CC"] == "gcc":
181    # GNU C on any system    # GNU C on any system
182    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"    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER  -Wno-sign-compare -Wno-system-headers -Wno-long-long"
183  #the strict aliasing warning is triggered by some type punning in the boost headers for version 1.34  #the long long warning occurs on the Mac
 #isystem does not seem to prevent this  
184    cc_optim      = "-O3"    cc_optim      = "-O3"
185    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
186    omp_optim     = ""    omp_optim     = ""
# Line 182  elif env["CC"] == "gcc": Line 188  elif env["CC"] == "gcc":
188    omp_libs      = []    omp_libs      = []
189    pedantic      = "-pedantic-errors -Wno-long-long"    pedantic      = "-pedantic-errors -Wno-long-long"
190    fatalwarning      = "-Werror"    fatalwarning      = "-Werror"
191      sysheaderopt      = "-isystem "
192  elif env["CC"] == "cl":  elif env["CC"] == "cl":
193    # Microsoft Visual C on Windows    # Microsoft Visual C on Windows
194    cc_flags      = "/FD /EHsc /GR /wd4068 -D_USE_MATH_DEFINES -DDLL_NETCDF"    cc_flags      = "/FD /EHsc /GR /wd4068 -D_USE_MATH_DEFINES -DDLL_NETCDF"
# Line 192  elif env["CC"] == "cl": Line 199  elif env["CC"] == "cl":
199    omp_libs      = []    omp_libs      = []
200    pedantic      = ""    pedantic      = ""
201    fatalwarning      = ""    fatalwarning      = ""
202      sysheaderopt      = ""
203  elif env["CC"] == "icl":  elif env["CC"] == "icl":
204    # intel C on Windows, see windows_intelc_options.py for a start    # intel C on Windows, see windows_intelc_options.py for a start
205    pedantic      = ""    pedantic      = ""
206    fatalwarning      = ""    fatalwarning      = ""
207      sysheaderopt      = ""
208    
209    
210  # If not specified in hostname_options.py then set them here  # If not specified in hostname_options.py then set them here
211  if env["cc_flags"]  == "-DEFAULT_1": env['cc_flags'] = cc_flags  if env["cc_flags"]  == "-DEFAULT_1": env['cc_flags'] = cc_flags
# Line 274  if env['usepedantic']: env.Append(CCFLAG Line 284  if env['usepedantic']: env.Append(CCFLAG
284  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
285    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.PrependENVPath('PATH',    [env['boost_lib_path']])
286    env.PrependENVPath('PATH',    [env['libinstall']])    env.PrependENVPath('PATH',    [env['libinstall']])
287    env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])    if not env['share_esysUtils'] :
288        env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
289      if not env['share_paso'] :
290        env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
291    
292    if env['usenetcdf']:    if env['usenetcdf']:
293      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])
# Line 314  if conf.CheckFunc('gethostname'): Line 327  if conf.CheckFunc('gethostname'):
327    
328  ############ python libraries (required) #######################  ############ python libraries (required) #######################
329    
330  conf.env.AppendUnique(CPPPATH       = [env['python_path']])  
331    if not sysheaderopt =="":
332      conf.env.Append(CCFLAGS=sysheaderopt+env['python_path'])
333    else:
334      conf.env.AppendUnique(CPPPATH     = [env['python_path']])
335    
336  conf.env.AppendUnique(LIBPATH       = [env['python_lib_path']])  conf.env.AppendUnique(LIBPATH       = [env['python_lib_path']])
337  conf.env.AppendUnique(LIBS      = [env['python_libs']])  conf.env.AppendUnique(LIBS      = [env['python_libs']])
338    
# Line 329  if not conf.CheckFunc('Py_Main'): Line 347  if not conf.CheckFunc('Py_Main'):
347    
348  ############ boost (required) ##################################  ############ boost (required) ##################################
349    
350  conf.env.AppendUnique(CPPPATH       = [env['boost_path']])  if not sysheaderopt =="":
351      conf.env.Append(CCFLAGS=sysheaderopt+env['boost_path']+'boost')
352    else:
353      conf.env.AppendUnique(CPPPATH     = [env['boost_path']])
354    
355  conf.env.AppendUnique(LIBPATH       = [env['boost_lib_path']])  conf.env.AppendUnique(LIBPATH       = [env['boost_lib_path']])
356  conf.env.AppendUnique(LIBS      = [env['boost_libs']])  conf.env.AppendUnique(LIBS      = [env['boost_libs']])
357    
# Line 442  if env['useumfpack']: Line 464  if env['useumfpack']:
464    
465  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0
466  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
467    if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?
468    
469  # Add UMFPACK to environment env if it was found  # Add UMFPACK to environment env if it was found
470  if env['useumfpack']:  if env['useumfpack']:

Legend:
Removed from v.2040  
changed lines
  Added in v.2130

  ViewVC Help
Powered by ViewVC 1.1.26