/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 5600 by jfenwick, Fri Apr 24 01:36:26 2015 UTC revision 5601 by jfenwick, Mon May 4 03:25:18 2015 UTC
# Line 1  Line 1 
1  ##############################################################################  ##############################################################################
2  #  #
3  # Copyright (c) 2003-2015 by The University of Queensland  # Copyright (c) 2003-2015 by University of Queensland
4  # http://www.uq.edu.au  # http://www.uq.edu.au
5  #  #
6  # Primary Business: Queensland, Australia  # Primary Business: Queensland, Australia
# Line 46  if not options_file: Line 46  if not options_file:
46  if not os.path.isfile(options_file):  if not os.path.isfile(options_file):
47      print("\nWARNING:\nOptions file %s" % options_file)      print("\nWARNING:\nOptions file %s" % options_file)
48      print("not found! Default options will be used which is most likely suboptimal.")      print("not found! Default options will be used which is most likely suboptimal.")
49      print("We recommend that you copy the most relevant options file in the scons/templates/")      print("We recommend that you copy the most relavent options file in the scons/template/")
50      print("subdirectory and customize it to your needs.\n")      print("subdirectory and customize it to your needs.\n")
51      options_file = None      options_file = None
52    
# Line 75  vars.AddVariables( Line 75  vars.AddVariables(
75    ('cc_debug', 'Additional (C and 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', ''),    ('cpp_flags', 'C Pre-processor flags', ''),
78      ('cpp_extra', 'Extra C Pre-processor flags', ''),
79    ('ld_extra', 'Extra linker flags', ''),    ('ld_extra', 'Extra linker flags', ''),
80    ('nvcc', 'Path to CUDA compiler', 'default'),    ('nvcc', 'Path to CUDA compiler', 'default'),
81    ('nvccflags', 'Base CUDA compiler flags', 'default'),    ('nvccflags', 'Base CUDA compiler flags', 'default'),
# Line 296  if env['omp_ldflags'] == 'default': env[ Line 297  if env['omp_ldflags'] == 'default': env[
297  if env['cxx_extra'] != '': env.Append(CXXFLAGS = env['cxx_extra'])  if env['cxx_extra'] != '': env.Append(CXXFLAGS = env['cxx_extra'])
298  if env['ld_extra']  != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra']  != '': env.Append(LINKFLAGS = env['ld_extra'])
299  if env['cpp_flags'] != '': env.Append(CPPFLAGS = env['cpp_flags'])  if env['cpp_flags'] != '': env.Append(CPPFLAGS = env['cpp_flags'])
300    if env['cpp_extra'] != '': env.Append(CPPFLAGS = " "+env['cpp_extra'])
301    
302  if env['nvccflags'] != 'default':  if env['nvccflags'] != 'default':
303      env['NVCCFLAGS'] = env['nvccflags']      env['NVCCFLAGS'] = env['nvccflags']

Legend:
Removed from v.5600  
changed lines
  Added in v.5601

  ViewVC Help
Powered by ViewVC 1.1.26