/[escript]/branches/4.0fordebian/SConstruct
ViewVC logotype

Diff of /branches/4.0fordebian/SConstruct

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

revision 3675 by jfenwick, Thu Nov 17 00:53:38 2011 UTC revision 3784 by caltinay, Wed Jan 25 01:31:42 2012 UTC
# Line 421  if not conf.CheckFunc('Py_Exit'): Line 421  if not conf.CheckFunc('Py_Exit'):
421      print("Cannot find python library method Py_Main (tried %s in directory %s)" % (python_libs, python_lib_path))      print("Cannot find python library method Py_Main (tried %s in directory %s)" % (python_libs, python_lib_path))
422      Exit(1)      Exit(1)
423    
424    # reuse conf to check for numpy header (optional)
425    if conf.CheckCXXHeader(['Python.h','numpy/ndarrayobject.h']):
426        conf.env.Append(CPPDEFINES = ['HAVE_NUMPY_H'])
427        conf.env['numpy_h']=True
428    else:
429        conf.env['numpy_h']=False
430    
431  # Commit changes to environment  # Commit changes to environment
432  env = conf.Finish()  env = conf.Finish()
433    
# Line 669  else: Line 676  else:
676      print("          LAPACK:  DISABLED")      print("          LAPACK:  DISABLED")
677  d_list=[]  d_list=[]
678  e_list=[]  e_list=[]
679  for i in 'debug','openmp','netcdf','parmetis','papi','mkl','umfpack','boomeramg','silo','visit':  for i in 'debug','openmp','netcdf','parmetis','papi','mkl','umfpack','boomeramg','silo','visit','vsl_random':
680      if env[i]: e_list.append(i)      if env[i]: e_list.append(i)
681      else: d_list.append(i)      else: d_list.append(i)
682  for i in e_list:  for i in e_list:
# Line 686  elif env['gmsh']=='s': Line 693  elif env['gmsh']=='s':
693      print("            gmsh:  FOUND")      print("            gmsh:  FOUND")
694  else:  else:
695      print("            gmsh:  NOT FOUND")      print("            gmsh:  NOT FOUND")
696  print("      vsl_random:  %s"%env['vsl_random'])  if env['numpy_h']:
697        print("   numpy headers:  FOUND")
698    else:
699        print("   numpy headers:  NOT FOUND")
700            
701  if ((fatalwarning != '') and (env['werror'])):  if ((fatalwarning != '') and (env['werror'])):
702      print("  Treating warnings as errors")      print("  Treating warnings as errors")

Legend:
Removed from v.3675  
changed lines
  Added in v.3784

  ViewVC Help
Powered by ViewVC 1.1.26