/[escript]/branches/scons-dev/SConstruct
ViewVC logotype

Diff of /branches/scons-dev/SConstruct

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

revision 1677 by ksteube, Sun Jul 27 09:30:26 2008 UTC revision 1678 by ksteube, Tue Jul 29 00:25:05 2008 UTC
# Line 95  opts.AddOptions( Line 95  opts.AddOptions(
95    BoolOption('usemkl', 'switch on/off the usage of MKL', 'yes'),    BoolOption('usemkl', 'switch on/off the usage of MKL', 'yes'),
96    ('mkl_path', 'Path to MKL includes', '/sw/sdev/cmkl/10.0.2.18/include'),    ('mkl_path', 'Path to MKL includes', '/sw/sdev/cmkl/10.0.2.18/include'),
97    ('mkl_lib_path', 'Path to MKL libs', '/sw/sdev/cmkl/10.0.2.18/lib/em64t'),    ('mkl_lib_path', 'Path to MKL libs', '/sw/sdev/cmkl/10.0.2.18/lib/em64t'),
98    ('mkl_libs', 'MKL libraries to link with', ['mkl_solver', 'mkl_em64t', 'mkl_core', 'guide', 'pthread']),    ('mkl_libs', 'MKL libraries to link with', ['mkl_solver', 'mkl_em64t', 'guide', 'pthread']),
99  # UMFPACK  # UMFPACK
100    BoolOption('useumfpack', 'switch on/off the usage of UMFPACK', 'yes'),    BoolOption('useumfpack', 'switch on/off the usage of UMFPACK', 'yes'),
101    ('ufc_path', 'Path to UFconfig includes', '/usr/include/suitesparse'),    ('ufc_path', 'Path to UFconfig includes', '/usr/include/suitesparse'),
# Line 191  except KeyError: pass Line 191  except KeyError: pass
191  try: env['ENV']['PYTHONPATH'] = os.environ['PYTHONPATH']  try: env['ENV']['PYTHONPATH'] = os.environ['PYTHONPATH']
192  except KeyError: pass  except KeyError: pass
193    
194    try: env['ENV']['C_INCLUDE_PATH'] = os.environ['C_INCLUDE_PATH']
195    except KeyError: pass
196    
197    try: env['ENV']['CPLUS_INCLUDE_PATH'] = os.environ['CPLUS_INCLUDE_PATH']
198    except KeyError: pass
199    
200  try: env['ENV']['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH']  try: env['ENV']['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH']
201  except KeyError: pass  except KeyError: pass
202    
# Line 250  env.Append(CPPDEFINES = ["SVN_VERSION="+ Line 256  env.Append(CPPDEFINES = ["SVN_VERSION="+
256  # environment.  # environment.
257  conf = Configure(clone_env(env))  conf = Configure(clone_env(env))
258    
259    ############ C compiler (required) #############################
260    
261    if not conf.CheckLib('c'):
262      print "Cannot run C compiler (or libc is missing)"
263      sys.exit(1)
264    
265  ############ numarray (required) ###############################  ############ numarray (required) ###############################
266    
267  try: from numarray import identity  try:
268  except ImportError: sys.exit(1)    from numarray import identity
269    except ImportError:
270      print "Cannot import numarray, you need to set your PYTHONPATH"
271      sys.exit(1)
272    
273  ############ python libraries (required) #######################  ############ python libraries (required) #######################
274    
# Line 261  conf.env.Append(CPPPATH        = [env['python_ Line 276  conf.env.Append(CPPPATH        = [env['python_
276  conf.env.Append(LIBPATH     = [env['python_lib_path']])  conf.env.Append(LIBPATH     = [env['python_lib_path']])
277  conf.env.Append(LIBS        = [env['python_libs']])  conf.env.Append(LIBS        = [env['python_libs']])
278    
279  if not conf.CheckCHeader('Python.h'): sys.exit(1)  if not conf.CheckCHeader('Python.h'):
280  if not conf.CheckFunc('Py_Main'): sys.exit(1)    print "Cannot find python include files (tried directory %s)" % env['python_path']
281      sys.exit(1)
282    if not conf.CheckFunc('Py_Main'):
283      print "Cannot find python library method Py_Main (tried directory %s)" % env['python_lib_path']
284      sys.exit(1)
285    
286  # Add python libraries to environment env  # Add python libraries to environment env
287  env.AppendUnique(CPPPATH = [env['python_path']])  env.AppendUnique(CPPPATH = [env['python_path']])

Legend:
Removed from v.1677  
changed lines
  Added in v.1678

  ViewVC Help
Powered by ViewVC 1.1.26