/[escript]/branches/ROBW_XPLATFORM/finley/src/SConscript
ViewVC logotype

Diff of /branches/ROBW_XPLATFORM/finley/src/SConscript

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

revision 647 by robwdcock, Wed Mar 22 14:11:03 2006 UTC revision 648 by robwdcock, Fri Mar 24 06:04:57 2006 UTC
# Line 28  if papi_libs: Line 28  if papi_libs:
28    
29  lib_name = 'finleycpp'  lib_name = 'finleycpp'
30    
31  local_env.Append(LIBS = [boost_lib, 'esysUtils', 'escriptcpp', 'paso'])  local_env.Append(LIBS = [boost_lib, python_lib, sys_libs, 'esysUtils', 'escriptcpp', 'paso'])
32    
33  lib = local_env.SharedLibrary(lib_name, sources)  lib = local_env.SharedLibrary(lib_name, sources)
34    
# Line 39  local_env.Install(include_path, headers Line 39  local_env.Install(include_path, headers
39  local_env.Install(cppadapter_include_path, cppadapter_headers )  local_env.Install(cppadapter_include_path, cppadapter_headers )
40  local_env.Install(libinstall, lib)  local_env.Install(libinstall, lib)
41    
42    # Call the unit tests SConscript
43    # export the lib target since tests will depend on it
44    # the lib target is a list of file nodes (why? win32 produces more than one output file: .lib, .dll, .pdb)
45    # FIXME: This list handling produces the desired result but can this be done directly with scons File nodes?
46    
47    dep_lib = [libinstall+'/'+str(x) for x in lib]
48    Export('dep_lib')
49    
50    local_env.SConscript(dirs = ['#/finley/test'], build_dir='#/build/$PLATFORM/finley/test', duplicate=0)
51    
52    
53    
54  # FIXME: old stuff  # FIXME: old stuff
55    
 #libs = ['escriptcpp',  
 #        'esysUtils',  
 #        'paso',  
 #        str(boost_lib),  
56  #        'dl',  #        'dl',
57  #        'util']     \  #        'util']     \
 #       + sys_libs   \  
58  #       + solver_libs \  #       + solver_libs \
59  #       + papi_libs  #       + papi_libs
60    

Legend:
Removed from v.647  
changed lines
  Added in v.648

  ViewVC Help
Powered by ViewVC 1.1.26