/[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 3736 by jfenwick, Thu Nov 17 00:53:38 2011 UTC revision 3737 by caltinay, Tue Dec 13 00:04:39 2011 UTC
# Line 135  cppadapter_headers = """ Line 135  cppadapter_headers = """
135      CPPAdapter/system_dep.h      CPPAdapter/system_dep.h
136  """.split()  """.split()
137    
138  local_env.Prepend(LIBS = ['escript', 'esysUtils', 'paso', 'pasowrap'])  local_env.Prepend(LIBS = ['pasowrap', 'escript', 'paso', 'esysUtils'])
139    
140  if IS_WINDOWS:  if IS_WINDOWS:
141      local_env.Append(CPPDEFINES = ['FINLEY_EXPORTS'])      local_env.Append(CPPDEFINES = ['FINLEY_EXPORTS'])
142    
# Line 155  lib_inst = local_env.Install(local_env[' Line 156  lib_inst = local_env.Install(local_env['
156  env.Alias('install_finley_lib', lib_inst)  env.Alias('install_finley_lib', lib_inst)
157    
158  ### Python wrapper ###  ### Python wrapper ###
159  py_wrapper_local_env.Prepend(LIBS = ['finley', 'pasowrap', 'escript', 'esysUtils', 'paso'])  if not env['build_shared']:
160        py_wrapper_local_env.Prepend(LIBS = ['finley', 'pasowrap', 'escript'])
161    else:
162        py_wrapper_local_env.Prepend(LIBS = ['finley', 'pasowrap', 'escript', 'paso', 'esysUtils'])
163    
164  py_wrapper_name = module_name + 'cpp'  py_wrapper_name = module_name + 'cpp'
165  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/finleycpp.cpp')  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/finleycpp.cpp')
166  env.Alias('build_finleycpp_lib', py_wrapper_lib)  env.Alias('build_finleycpp_lib', py_wrapper_lib)

Legend:
Removed from v.3736  
changed lines
  Added in v.3737

  ViewVC Help
Powered by ViewVC 1.1.26