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

Diff of /branches/diaplayground/SConstruct

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

revision 1428 by trankine, Wed Feb 27 08:07:11 2008 UTC revision 1559 by ksteube, Wed May 21 04:27:15 2008 UTC
# Line 238  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 293  if IS_WINDOWS_PLATFORM: Line 297  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)        #env = Environment(tools = ['default', 'intelc'], options = opts)
299  else:  else:
300     if os.uname()[4]=='ia64':     if socket.gethostname().split('.')[0] == 'service0':
301          env = Environment(tools = ['default', 'intelc'], options = opts)
302       elif os.uname()[4]=='ia64':
303        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
304        if env['CXX'] == 'icpc':        if env['CXX'] == 'icpc':
305           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not). FIXME: this behaviour could be directly incorporated into scons intelc.py           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not). FIXME: this behaviour could be directly incorporated into scons intelc.py
# Line 352  except KeyError: Line 358  except KeyError:
358    
359  try:  try:
360     tmp = os.environ['LD_LIBRARY_PATH']     tmp = os.environ['LD_LIBRARY_PATH']
    print tmp  
361     env['ENV']['LD_LIBRARY_PATH'] = tmp     env['ENV']['LD_LIBRARY_PATH'] = tmp
362  except KeyError:  except KeyError:
363     pass     pass
# Line 717  try: Line 722  try:
722     epydoc_path = env['epydoc_path']     epydoc_path = env['epydoc_path']
723  except KeyError:  except KeyError:
724     epydoc_path = None     epydoc_path = None
725    # =============== ParMETIS =======================================
726    try:
727       parmetis_path = env['parmetis_path']
728       parmetis_lib_path = env['parmetis_lib_path']
729       parmetis_lib = env['parmetis_lib']
730    except KeyError:
731       parmetis_path = ''
732       parmetis_lib_path = ''
733       parmetis_lib = ''
734    
735    if useMPI and os.path.isdir(parmetis_lib_path):
736       env.Append(CPPDEFINES = [ 'PARMETIS' ])
737       env.Append(CXXDEFINES = [ 'PARMETIS' ])
738       env.Append(CPPPATH = [parmetis_path])
739       env.Append(LIBPATH = [parmetis_lib_path])
740       env.Append(LIBS = parmetis_lib)
741  # =============== PAPI =======================================  # =============== PAPI =======================================
742  try:  try:
743     includes = env['papi_path']     includes = env['papi_path']

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

  ViewVC Help
Powered by ViewVC 1.1.26