/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 898 by gross, Sun Nov 12 23:56:26 2006 UTC revision 950 by gross, Tue Feb 6 07:01:11 2007 UTC
# Line 115  opts.AddOptions( Line 115  opts.AddOptions(
115    PathOption('blas_path', 'Path to BLAS includes', None),    PathOption('blas_path', 'Path to BLAS includes', None),
116    PathOption('blas_lib_path', 'Path to BLAS libs', None),    PathOption('blas_lib_path', 'Path to BLAS libs', None),
117    ('blas_libs', 'BLAS libraries to link with', None),    ('blas_libs', 'BLAS libraries to link with', None),
118    # netCDF
119      PathOption('netCDF_path', 'Path to netCDF includes', '/usr/local/include'),
120      PathOption('netCDF_lib_path', 'Path to netCDF libs', '/usr/local/lib'),
121      ('netCDF_libs_cxx', 'netCDF C++ libraries to link with', [ 'netcdf_c++', 'netcdf'] ),
122  # Python  # Python
123  # locations of include files for python  # locations of include files for python
124    PathOption('python_path', 'Path to Python includes', '/usr/include/python%s.%s'%(sys.version_info[0],sys.version_info[1])),    PathOption('python_path', 'Path to Python includes', '/usr/include/python%s.%s'%(sys.version_info[0],sys.version_info[1])),
# Line 404  except KeyError: Line 408  except KeyError:
408     blas_libs = ''     blas_libs = ''
409    
410  try:  try:
411       includes = env['netCDF_path']
412       env.Append(CPPPATH = [includes,])
413    except KeyError:
414       pass
415    
416    try:
417       lib_path = env['netCDF_lib_path']
418       env.Append(LIBPATH = [lib_path,])
419    except KeyError:
420       pass
421    
422    try:
423       netCDF_libs_cxx = env['netCDF_libs_cxx']
424    except KeyError:
425       netCDF_lib_cxx = [ ]
426    
427    try:
428     includes = env['boost_path']     includes = env['boost_path']
429     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
430  except KeyError:  except KeyError:
# Line 520  init_target = env.Command(pyinstall+'/__ Line 541  init_target = env.Command(pyinstall+'/__
541  env.Alias(init_target)  env.Alias(init_target)
542    
543  # Allow sconscripts to see the env  # Allow sconscripts to see the env
544  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs",  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs", "netCDF_libs_cxx",
545      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",
546          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile",          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile",
547          "guide_pdf", "guide_html_index", "api_epydoc", "useMPI"])          "guide_pdf", "guide_html_index", "api_epydoc", "useMPI"])
Legend:
Removed from v.898  
changed lines
  Added in v.950
  ViewVC Help
Powered by ViewVC 1.1.26