/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 5588 by jfenwick, Wed Apr 1 07:38:51 2015 UTC revision 5589 by jfenwick, Wed Apr 22 03:13:44 2015 UTC
# Line 56  default_prefix='/usr' Line 56  default_prefix='/usr'
56  mpi_flavours=('no', 'none', 'MPT', 'MPICH', 'MPICH2', 'OPENMPI', 'INTELMPI')  mpi_flavours=('no', 'none', 'MPT', 'MPICH', 'MPICH2', 'OPENMPI', 'INTELMPI')
57  lapack_flavours=('none', 'clapack', 'mkl')  lapack_flavours=('none', 'clapack', 'mkl')
58    
59    #Note that scons construction vars the the following purposes:
60    #  CPPFLAGS -> to the preprocessor
61    #  CCFLAGS  -> flags for _both_ C and C++
62    #  CXXFLAGS -> flags for c++ _only_
63    #  CFLAGS   -> flags for c only
64    
65  vars = Variables(options_file, ARGUMENTS)  vars = Variables(options_file, ARGUMENTS)
66  vars.AddVariables(  vars.AddVariables(
67    PathVariable('options_file', 'Path to options file', options_file, PathVariable.PathIsFile),    PathVariable('options_file', 'Path to options file', options_file, PathVariable.PathIsFile),
# Line 64  vars.AddVariables( Line 70  vars.AddVariables(
70    BoolVariable('verbose', 'Output full compile/link lines', False),    BoolVariable('verbose', 'Output full compile/link lines', False),
71  # Compiler/Linker options  # Compiler/Linker options
72    ('cxx', 'Path to C++ compiler', 'default'),    ('cxx', 'Path to C++ compiler', 'default'),
73    ('cc_flags', 'Base C++ compiler flags', 'default'),    ('cc_flags', 'Base (C and C++) compiler flags', 'default'),
74    ('cc_optim', 'Additional C++ flags for a non-debug build', 'default'),    ('cc_optim', 'Additional (C and C++) flags for a non-debug build', 'default'),
75    ('cc_debug', 'Additional C++ flags for a debug build', 'default'),    ('cc_debug', 'Additional (C and C++) flags for a debug build', 'default'),
76    ('cxx_extra', 'Extra C++ compiler flags', ''),    ('cxx_extra', 'Extra C++ compiler flags', ''),
77      ('cpp_flags', 'C Pre-processor flags', ''),
78    ('ld_extra', 'Extra linker flags', ''),    ('ld_extra', 'Extra linker flags', ''),
79    ('nvcc', 'Path to CUDA compiler', 'default'),    ('nvcc', 'Path to CUDA compiler', 'default'),
80    ('nvccflags', 'Base CUDA compiler flags', 'default'),    ('nvccflags', 'Base CUDA compiler flags', 'default'),
# Line 288  if env['omp_flags']   == 'default': env[ Line 295  if env['omp_flags']   == 'default': env[
295  if env['omp_ldflags'] == 'default': env['omp_ldflags'] = omp_ldflags  if env['omp_ldflags'] == 'default': env['omp_ldflags'] = omp_ldflags
296  if env['cxx_extra'] != '': env.Append(CXXFLAGS = env['cxx_extra'])  if env['cxx_extra'] != '': env.Append(CXXFLAGS = env['cxx_extra'])
297  if env['ld_extra']  != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra']  != '': env.Append(LINKFLAGS = env['ld_extra'])
298    if env['cpp_flags'] != '': env.Append(CPPFLAGS = env['cpp_flags'])
299    
300  if env['nvccflags'] != 'default':  if env['nvccflags'] != 'default':
301      env['NVCCFLAGS'] = env['nvccflags']      env['NVCCFLAGS'] = env['nvccflags']

Legend:
Removed from v.5588  
changed lines
  Added in v.5589

  ViewVC Help
Powered by ViewVC 1.1.26