/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1374 by gross, Tue Jan 8 09:37:55 2008 UTC revision 1428 by trankine, Wed Feb 27 08:07:11 2008 UTC
# Line 31  tools_prefix="/usr" Line 31  tools_prefix="/usr"
31  #      #    
32  #    get the installation prefix  #    get the installation prefix
33  #  #
34  prefix = ARGUMENTS.get('prefix', '/usr')  prefix = ARGUMENTS.get('prefix', sys.prefix )
35    
36  # We may also need to know where python's site-packages subdirectory lives  # We may also need to know where python's site-packages subdirectory lives
37  python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])  python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])
# Line 291  opts.AddOptions( Line 291  opts.AddOptions(
291    
292  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
293        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(tools = ['default', 'msvc'], options = opts)
294          #env = Environment(tools = ['default', 'intelc'], options = opts)
295  else:  else:
296     if os.uname()[4]=='ia64':     if os.uname()[4]=='ia64':
297        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
# Line 452  except KeyError: Line 453  except KeyError:
453     useMPI = None     useMPI = None
454  # ========= set compiler flags ===========================================  # ========= set compiler flags ===========================================
455    
 # Can't use MPI and OpenMP simultaneously at this time  
 if useMPI:  
     omp_flags=''  
     omp_flags_debug=''  
   
456  if dodebug:  if dodebug:
457      try:      try:
458        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug
# Line 851  try: Line 847  try:
847     global_revision = re.sub(":.*", "", global_revision[0])     global_revision = re.sub(":.*", "", global_revision[0])
848     global_revision = re.sub("[^0-9]", "", global_revision)     global_revision = re.sub("[^0-9]", "", global_revision)
849  except:  except:
850     global_revision = "0"     global_revision="-1"
851       print "Warning: unable to recover global revsion number."
852    if global_revision == "": global_revision="0"
853    print "Revision number is %s."%global_revision
854  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
855    
856  # Python install - esys __init__.py  # Python install - esys __init__.py

Legend:
Removed from v.1374  
changed lines
  Added in v.1428

  ViewVC Help
Powered by ViewVC 1.1.26