Show
Ignore:
Timestamp:
08/21/06 11:21:00 (2 years ago)
Author:
allenb
Message:

- Add support for multiple libraries in osg-config
- Use the Config backend for figuring out the deps for tests
- Build tests into a common test directory for each variant
- Remove some code Dirk was using to solve for the deps manually

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/scons_build_creation/osg-config.in

    r26 r36  
    7676   # Try to find libname 
    7777   # - Try given name and name with OSG prefix 
    78    query_lib = None 
    79    if len(pos_args): 
    80       libname = pos_args[0] 
    81       if lib_map.has_key(libname): 
    82          query_lib = lib_map[libname] 
    83       elif lib_map.has_key("OSG%s"%libname): 
    84          query_lib = lib_map["OSG%s"%libname] 
    85       else: 
    86          print "Error: Can not find library named: ", libname 
     78   libraries = [] 
     79   if len(pos_args):       
     80      for n in pos_args: 
     81         if lib_map.has_key(n): 
     82            libraries.append(lib_map[n]) 
     83         elif lib_map.has_key("OSG%s"%n): 
     84            libraries.append(lib_map["OSG%s"%n]) 
     85         else: 
     86            print "Error: Can not find library named: ", n 
    8787    
    88    if not query_lib: 
     88   if len(libraries) == 0: 
    8989      printUsage() 
    9090      sys.exit(1) 
    …… 
    100100   default_lib_settings.libpath.insert(0, inst_lib_path)  
    101101   default_lib_settings.cpppath.insert(0, inst_inc_path) 
    102    config_info = ConfigInfoAdapter(query_lib, default_lib_settings, 
     102   config_info = ConfigInfoAdapter(libraries, lib_map, default_lib_settings, 
    103103                     options.inc_prefix, options.lib_prefix, options.libpath_prefix) 
    104104