/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1519 by jpye, Thu Jun 28 15:04:00 2007 UTC revision 1520 by jpye, Sat Jun 30 01:23:36 2007 UTC
# Line 140  opts.Add(BoolOption( Line 140  opts.Add(BoolOption(
140  opts.Add(ListOption(  opts.Add(ListOption(
141      'WITH_SOLVERS'      'WITH_SOLVERS'
142      ,"List of the solvers you want to build. The default is the minimum that"        ,"List of the solvers you want to build. The default is the minimum that"  
143          +" works."          +" works. The option 'LSOD' is provided for backwards compatibility"
144            +"; the value 'LSODE' is preferred."
145      ,["QRSLV","CMSLV","LSODE","IDA","CONOPT","LRSLV","TRON"]      ,["QRSLV","CMSLV","LSODE","IDA","CONOPT","LRSLV","TRON"]
146      ,['QRSLV','MPS','SLV','OPTSQP'      ,['QRSLV','MPS','SLV','OPTSQP'
147          ,'NGSLV','CMSLV','LRSLV','MINOS','CONOPT'          ,'NGSLV','CMSLV','LRSLV','MINOS','CONOPT'
148          ,'LSODE','OPTSQP',"IDA","TRON"          ,'LSODE','LSOD','OPTSQP',"IDA","TRON"
149       ]       ]
150  ))  ))
151    
# Line 735  env = Environment( Line 736  env = Environment(
736  #print "CPPPATH =",env['CPPPATH']  #print "CPPPATH =",env['CPPPATH']
737    
738  opts.Update(env)  opts.Update(env)
739    
740    if 'LSOD' in env['WITH_SOLVERS']:
741        if 'LSODE' not in env['WITH_SOLVERS']:
742            env['WITH_SOLVERS'].append('LSODE')
743        env['WITH_SOLVERS'].remove('LSOD')
744    
745  opts.Save('options.cache',env)  opts.Save('options.cache',env)
746    
747  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))

Legend:
Removed from v.1519  
changed lines
  Added in v.1520

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22