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

Diff of /branches/windows_from_1456_trunk_1544_merged_in/SConstruct

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

trunk/SConstruct revision 1415 by ksteube, Thu Feb 21 04:57:17 2008 UTC branches/windows_from_1456_trunk_1522_merged_in/SConstruct revision 1523 by phornby, Tue Apr 22 06:15:31 2008 UTC
# Line 12  Line 12 
12  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
13  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
14    
   
15  #===============================================================  #===============================================================
16  #   import tools:  #   import tools:
17  import glob  import glob
# Line 239  opts.AddOptions( Line 238  opts.AddOptions(
238    PathOption('amd_path', 'Path to AMD includes', amd_path_default),    PathOption('amd_path', 'Path to AMD includes', amd_path_default),
239    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),
240    ('amd_libs', 'AMD libraries to link with', amd_libs_default),    ('amd_libs', 'AMD libraries to link with', amd_libs_default),
241    # ParMETIS
242      ('parmetis_path', 'Path to ParMETIS includes', ''),
243      ('parmetis_lib_path', 'Path to ParMETIS library', ''),
244      ('parmetis_lib', 'ParMETIS library to link with', []),
245  # TRILINOS  # TRILINOS
246    PathOption('trilinos_path', 'Path to TRILINOS includes', None),    PathOption('trilinos_path', 'Path to TRILINOS includes', None),
247    PathOption('trilinos_lib_path', 'Path to TRILINOS libs', None),    PathOption('trilinos_lib_path', 'Path to TRILINOS libs', None),
# Line 292  opts.AddOptions( Line 295  opts.AddOptions(
295    
296  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
297        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(tools = ['default', 'msvc'], options = opts)
298          #env = Environment(tools = ['default', 'intelc'], options = opts)
299  else:  else:
300     if os.uname()[4]=='ia64':     if os.uname()[4]=='ia64':
301        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
# Line 717  try: Line 721  try:
721     epydoc_path = env['epydoc_path']     epydoc_path = env['epydoc_path']
722  except KeyError:  except KeyError:
723     epydoc_path = None     epydoc_path = None
724    # =============== ParMETIS =======================================
725    try:
726       parmetis_path = env['parmetis_path']
727       parmetis_lib_path = env['parmetis_lib_path']
728       parmetis_lib = env['parmetis_lib']
729    except KeyError:
730       parmetis_path = ''
731       parmetis_lib_path = ''
732       parmetis_lib = ''
733    
734    if useMPI and os.path.isdir(parmetis_lib_path):
735       env.Append(CPPDEFINES = [ 'PARMETIS' ])
736       env.Append(CXXDEFINES = [ 'PARMETIS' ])
737       env.Append(CPPPATH = [parmetis_path])
738       env.Append(LIBPATH = [parmetis_lib_path])
739       env.Append(LIBS = parmetis_lib)
740  # =============== PAPI =======================================  # =============== PAPI =======================================
741  try:  try:
742     includes = env['papi_path']     includes = env['papi_path']
# Line 849  try: Line 869  try:
869  except:  except:
870     global_revision="-1"     global_revision="-1"
871     print "Warning: unable to recover global revsion number."     print "Warning: unable to recover global revsion number."
872    if global_revision == "": global_revision="0"
873  print "Revision number is %s."%global_revision  print "Revision number is %s."%global_revision
874  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
875    
# Line 905  except AttributeError: Line 926  except AttributeError:
926  # Third Party libraries  # Third Party libraries
927  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)
928  # C/C++ Libraries  # C/C++ Libraries
929    env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
930    env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)
931  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)
932  # bruce is removed for now as it doesn't really do anything  # bruce is removed for now as it doesn't really do anything
933  # env.SConscript(dirs = ['bruce/src'], build_dir='build/$PLATFORM/bruce', duplicate=0)  # env.SConscript(dirs = ['bruce/src'], build_dir='build/$PLATFORM/bruce', duplicate=0)
 env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)  
 env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  
934  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
935  env.SConscript(dirs = ['modellib/py_src'], build_dir='build/$PLATFORM/modellib', duplicate=0)  env.SConscript(dirs = ['modellib/py_src'], build_dir='build/$PLATFORM/modellib', duplicate=0)
936  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)

Legend:
Removed from v.1415  
changed lines
  Added in v.1523

  ViewVC Help
Powered by ViewVC 1.1.26