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

Diff of /branches/schroedinger_upto1946/SConstruct

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

revision 751 by bcumming, Mon Jun 26 01:46:34 2006 UTC revision 757 by woo409, Mon Jun 26 13:12:56 2006 UTC
# Line 126  if os.name != "nt" and os.uname()[4]=='i Line 126  if os.name != "nt" and os.uname()[4]=='i
126     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
127        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
128  elif os.name == "nt":  elif os.name == "nt":
    # FIXME: Need to implement equivalent of ld library path for windoze  
129     env = Environment(tools = ['default', 'intelc'], options = opts)     env = Environment(tools = ['default', 'intelc'], options = opts)
130     env['ENV']['PYTHONPATH'] = python_path     env['ENV']['PYTHONPATH'] = python_path
131  else:  else:
# Line 161  try: Line 160  try:
160     libinstall = env['libinstall']     libinstall = env['libinstall']
161     env.Append(LIBPATH = [libinstall,])     env.Append(LIBPATH = [libinstall,])
162     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
163       if env['PLATFORM'] == "win32":
164          env.PrependENVPath('PATH', libinstall)
165          env.PrependENVPath('PATH', env['boost_lib_path'])
166  except KeyError:  except KeyError:
167     libinstall = None       libinstall = None  
168  try:  try:
# Line 174  except KeyError: Line 176  except KeyError:
176     dodebug = None       dodebug = None  
177  try:  try:
178     cc_defines = env['cc_defines']     cc_defines = env['cc_defines']
179     env.Append(CPPDEFINES = [cc_defines,])     env.Append(CPPDEFINES = cc_defines)
180  except KeyError:  except KeyError:
181     pass     pass
182  if dodebug:  if dodebug:
# Line 375  env.Alias('py_tests', 'build_py_tests') Line 377  env.Alias('py_tests', 'build_py_tests')
377  env.Alias('all_tests', ['run_tests', 'py_tests']) # target to run all C++ and released python tests  env.Alias('all_tests', ['run_tests', 'py_tests']) # target to run all C++ and released python tests
378    
379  # Python install - esys __init__.py  # Python install - esys __init__.py
380  # This is just an empty file but stills need to be touched so add a special target and Command. Note you can't use the scons Touch() function as it will not  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))
381  # create the file if it doesn't exist  env.Alias(init_target)
 env.Command(pyinstall+'/__init__.py', None, 'touch $TARGET')  
382    
383  # Allow sconscripts to see the env  # Allow sconscripts to see the env
384  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs",  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs",

Legend:
Removed from v.751  
changed lines
  Added in v.757

  ViewVC Help
Powered by ViewVC 1.1.26