/[escript]/trunk/finley/src/SConscript
ViewVC logotype

Diff of /trunk/finley/src/SConscript

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

revision 1235 by phornby, Mon Aug 13 00:25:29 2007 UTC revision 1312 by ksteube, Mon Sep 24 06:18:44 2007 UTC
# Line 31  sources += [ x for x in cppadapter_filen Line 31  sources += [ x for x in cppadapter_filen
31  cppadapter_headers = [x for x in cppadapter_filenames if os.path.splitext(x)[1] in ['.h']]  cppadapter_headers = [x for x in cppadapter_filenames if os.path.splitext(x)[1] in ['.h']]
32    
33  sources.remove(py_wrapper_source) # FIXME: should probably refactor the source tree so the python wrapper isn't colocated with c++ sources  sources.remove(py_wrapper_source) # FIXME: should probably refactor the source tree so the python wrapper isn't colocated with c++ sources
34  local_env.Append(LIBS = [boost_lib, python_lib, 'escript', 'esysUtils', 'paso'] + sys_libs)  local_env.Append(LIBS = [boost_lib, python_lib, 'escript', 'esysUtils', 'paso'] + sys_libs + mpi_libs )
35  py_wrapper_local_env.Append(LIBS = [boost_lib, python_lib, lib_name, 'escript', 'esysUtils', 'paso'] + sys_libs)  py_wrapper_local_env.Append(LIBS = [boost_lib, python_lib, lib_name, 'escript', 'esysUtils', 'paso'] + sys_libs + mpi_libs )
36    
37  if mkl_libs:  if mkl_libs:
38     local_env.Append(CPPDEFINES=['MKL',])     local_env.Append(CPPDEFINES=['MKL',])
# Line 40  if mkl_libs: Line 40  if mkl_libs:
40  if scsl_libs:  if scsl_libs:
41     local_env.Append(CPPDEFINES=['SCSL',])     local_env.Append(CPPDEFINES=['SCSL',])
42     local_env.Append(LIBS = scsl_libs)     local_env.Append(LIBS = scsl_libs)
43  if umf_libs and amd_libs:  if umf_libs:
44     local_env.Append(CPPDEFINES=['UMFPACK',])     local_env.Append(CPPDEFINES=['UMFPACK',])
45     local_env.Append(LIBS = umf_libs)     local_env.Append(LIBS = umf_libs)
    local_env.Append(LIBS = amd_libs)  
46    
47  if blas_libs:  if blas_libs:
48     local_env.Append(LIBS = blas_libs)     local_env.Append(LIBS = blas_libs)
49    
50  if papi_libs:  if papi_instrument_solver:
51     local_env.Append(CPPDEFINES=['PAPI',])     local_env.Append(CPPDEFINES=['PAPI',])
52    if papi_libs:
53     local_env.Append(LIBS = papi_libs)     local_env.Append(LIBS = papi_libs)
54       local_env.Append(CPPDEFINES=['BLOCKPAPI',])
55    
56    if trilinos_libs:
57       local_env.Append(CPPDEFINES=['TRILINOS',])
58       local_env.Append(LIBS = trilinos_libs)
59    
60  local_env.Append(CPPDEFINES = 'FINLEY_EXPORTS')  local_env.Append(CPPDEFINES = 'FINLEY_EXPORTS')
61    
# Line 74  Export('dep_lib') Line 79  Export('dep_lib')
79  # add source files to release  # add source files to release
80  release_srcfiles = [ env.File(x) for x in filenames + cppadapter_filenames ] + [env.File("SConscript"), ]  release_srcfiles = [ env.File(x) for x in filenames + cppadapter_filenames ] + [env.File("SConscript"), ]
81  env.Zip(src_zipfile, release_srcfiles)  env.Zip(src_zipfile, release_srcfiles)
82  try:  env.Tar(src_tarfile, release_srcfiles)
83    env.Tar(src_tarfile, release_srcfiles)  
 except AttributeError:  
   pass  
84  # Call the python sconscript  # Call the python sconscript
85  env.SConscript(dirs = ['#/finley/py_src'], build_dir='py', duplicate=0)  env.SConscript(dirs = ['#/finley/py_src'], build_dir='py', duplicate=0)
86    

Legend:
Removed from v.1235  
changed lines
  Added in v.1312

  ViewVC Help
Powered by ViewVC 1.1.26