--- branches/ROBW_XPLATFORM/finley/src/SConscript	2006/03/24 05:23:05	647
+++ branches/ROBW_XPLATFORM/finley/src/SConscript	2006/03/24 06:04:57	648
@@ -28,7 +28,7 @@
 
 lib_name = 'finleycpp'
 
-local_env.Append(LIBS = [boost_lib, 'esysUtils', 'escriptcpp', 'paso'])
+local_env.Append(LIBS = [boost_lib, python_lib, sys_libs, 'esysUtils', 'escriptcpp', 'paso'])
 
 lib = local_env.SharedLibrary(lib_name, sources)
 
@@ -39,16 +39,22 @@
 local_env.Install(cppadapter_include_path, cppadapter_headers )
 local_env.Install(libinstall, lib)
 
+# Call the unit tests SConscript
+# export the lib target since tests will depend on it
+# the lib target is a list of file nodes (why? win32 produces more than one output file: .lib, .dll, .pdb)
+# FIXME: This list handling produces the desired result but can this be done directly with scons File nodes?
+
+dep_lib = [libinstall+'/'+str(x) for x in lib]
+Export('dep_lib')
+
+local_env.SConscript(dirs = ['#/finley/test'], build_dir='#/build/$PLATFORM/finley/test', duplicate=0)
+
+
 
 # FIXME: old stuff
 
-#libs = ['escriptcpp',
-#        'esysUtils',
-#        'paso',
-#        str(boost_lib),
 #        'dl',
 #        'util']     \
-#       + sys_libs   \
 #       + solver_libs \
 #       + papi_libs