/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2430 by jfenwick, Wed May 20 03:20:57 2009 UTC revision 2531 by jfenwick, Thu Jul 9 23:56:57 2009 UTC
# Line 356  except: Line 356  except:
356  if global_revision == "": global_revision="-2"  if global_revision == "": global_revision="-2"
357  env.Append(CPPDEFINES = ["SVN_VERSION="+global_revision])  env.Append(CPPDEFINES = ["SVN_VERSION="+global_revision])
358    
359  ############ numarray (required) ###############################  ############ numpy (required) ###############################
360    
361  try:  try:
362    from numarray import identity    from numpy import identity
363  except ImportError:  except ImportError:
364    print "Cannot import numarray, you need to set your PYTHONPATH"    print "Cannot import numpy, you need to set your PYTHONPATH"
365    sys.exit(1)    sys.exit(1)
366    
367  ############ C compiler (required) #############################  ############ C compiler (required) #############################
# Line 536  if env['useumfpack']: Line 536  if env['useumfpack']:
536    conf.env.PrependENVPath('PYTHONPATH', prefix)    conf.env.PrependENVPath('PYTHONPATH', prefix)
537    conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])    conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])
538    
 if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0  
539  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0
540    if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0
541  # if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?  # if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?
542    
543  # Add UMFPACK to environment env if it was found  # Add UMFPACK to environment env if it was found
# Line 669  if ((fatalwarning != "") and (env['usewa Line 669  if ((fatalwarning != "") and (env['usewa
669  print ""  print ""
670  print "Summary of configuration (see ./config.log for information)"  print "Summary of configuration (see ./config.log for information)"
671  print " Using python libraries"  print " Using python libraries"
672  print " Using numarray"  print " Using numpy"
673  print " Using boost"  print " Using boost"
674  if env['usenetcdf']: print "    Using NetCDF"  if env['usenetcdf']: print "    Using NetCDF"
675  else: print "   Not using NetCDF"  else: print "   Not using NetCDF"
# Line 853  env.Alias('build_full',['install_all','b Line 853  env.Alias('build_full',['install_all','b
853    
854  ############ Targets to build the documentation ################  ############ Targets to build the documentation ################
855    
856    env.Alias('api_epydoc','install_all')
857    
858  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])
859    
860  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:

Legend:
Removed from v.2430  
changed lines
  Added in v.2531

  ViewVC Help
Powered by ViewVC 1.1.26