/[escript]/branches/symbolic_from_3470/dudley/src/SConscript
ViewVC logotype

Diff of /branches/symbolic_from_3470/dudley/src/SConscript

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

revision 3788 by caltinay, Wed Sep 21 04:48:06 2011 UTC revision 3789 by caltinay, Tue Jan 31 04:55:05 2012 UTC
# Line 97  sources = """ Line 97  sources = """
97      CPPAdapter/DudleyError.cpp      CPPAdapter/DudleyError.cpp
98      CPPAdapter/MeshAdapter.cpp      CPPAdapter/MeshAdapter.cpp
99      CPPAdapter/MeshAdapterFactory.cpp      CPPAdapter/MeshAdapterFactory.cpp
     CPPAdapter/SystemMatrixAdapter.cpp  
     CPPAdapter/TransportProblemAdapter.cpp  
100  """.split()  """.split()
101  unroll_sources= """  unroll_sources= """
102      Assemble_gradient.c      Assemble_gradient.c
# Line 126  cppadapter_headers = """ Line 124  cppadapter_headers = """
124      CPPAdapter/DudleyError.h      CPPAdapter/DudleyError.h
125      CPPAdapter/MeshAdapter.h      CPPAdapter/MeshAdapter.h
126      CPPAdapter/MeshAdapterFactory.h      CPPAdapter/MeshAdapterFactory.h
     CPPAdapter/SystemMatrixAdapter.h  
     CPPAdapter/TransportProblemAdapter.h  
127      CPPAdapter/system_dep.h      CPPAdapter/system_dep.h
128  """.split()  """.split()
129    
130  local_env.Append(LIBS = ['escript', 'esysUtils', 'paso'])  local_env.Prepend(LIBS = ['pasowrap', 'escript', 'paso', 'esysUtils'])
131    
132  if IS_WINDOWS :  if IS_WINDOWS :
133    local_env.Append(CPPDEFINES = ['DUDLEY_EXPORTS'])    local_env.Append(CPPDEFINES = ['DUDLEY_EXPORTS'])
# Line 154  lib_inst = local_env.Install(local_env[' Line 150  lib_inst = local_env.Install(local_env['
150  env.Alias('install_dudley_lib', lib_inst)  env.Alias('install_dudley_lib', lib_inst)
151    
152  ### Python wrapper ###  ### Python wrapper ###
153  py_wrapper_local_env.Append(LIBS = ['dudley', 'escript', 'esysUtils', 'paso'])  if not env['build_shared']:
154        py_wrapper_local_env.Prepend(LIBS = ['dudley', 'pasowrap', 'escript', 'esysUtils'])
155    else:
156        py_wrapper_local_env.Prepend(LIBS = ['dudley', 'pasowrap', 'escript', 'paso', 'esysUtils'])
157  py_wrapper_name = module_name + 'cpp'  py_wrapper_name = module_name + 'cpp'
158  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/dudleycpp.cpp')  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/dudleycpp.cpp')
159  env.Alias('build_dudleycpp_lib', py_wrapper_lib)  env.Alias('build_dudleycpp_lib', py_wrapper_lib)

Legend:
Removed from v.3788  
changed lines
  Added in v.3789

  ViewVC Help
Powered by ViewVC 1.1.26