/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2356 by jpye, Sat Jan 8 12:24:04 2011 UTC revision 2378 by jpye, Mon Feb 7 07:48:50 2011 UTC
# Line 293  vars.Add(ListVariable( Line 293  vars.Add(ListVariable(
293      ,["QRSLV","CMSLV","LSODE","IDA","CONOPT","LRSLV","TRON","IPOPT","DOPRI5"]      ,["QRSLV","CMSLV","LSODE","IDA","CONOPT","LRSLV","TRON","IPOPT","DOPRI5"]
294      ,['QRSLV','MPS','SLV','OPTSQP'      ,['QRSLV','MPS','SLV','OPTSQP'
295          ,'NGSLV','CMSLV','LRSLV','MINOS','CONOPT'          ,'NGSLV','CMSLV','LRSLV','MINOS','CONOPT'
296          ,'LSODE','LSOD','OPTSQP',"IDA","TRON","IPOPT","DOPRI5"          ,'LSODE','LSOD','OPTSQP',"IDA","TRON","IPOPT","DOPRI5","MAKEMPS"
297       ]       ]
298  ))  ))
299    
# Line 1021  without_conopt_reason = "Not selected (s Line 1021  without_conopt_reason = "Not selected (s
1021  with_ipopt = 'IPOPT' in env['WITH_SOLVERS']  with_ipopt = 'IPOPT' in env['WITH_SOLVERS']
1022  without_ipopt_reason = "Not selected (see config option WITH_SOLVERS)"  without_ipopt_reason = "Not selected (see config option WITH_SOLVERS)"
1023    
1024    with_makemps = 'MAKEMPS' in env['WITH_SOLVERS']
1025    without_makemps_reason = "Not selected (see config option WITH_SOLVERS)"
1026    
1027    
1028  #print "SOLVERS:",env['WITH_SOLVERS']  #print "SOLVERS:",env['WITH_SOLVERS']
1029  #print "WITH_BINTOKEN:",env['WITH_BINTOKEN']  #print "WITH_BINTOKEN:",env['WITH_BINTOKEN']
# Line 2705  if with_ipopt: Line 2708  if with_ipopt:
2708  if with_dopri5:  if with_dopri5:
2709      env.Append(WITH_DOPRI5=1)      env.Append(WITH_DOPRI5=1)
2710    
2711    if with_makemps:
2712        env.Append(WITH_MAKEMPS=1)
2713    
2714  if with_graphviz and env.get('GRAPHVIZ_RPATH'):  if with_graphviz and env.get('GRAPHVIZ_RPATH'):
2715      env.Append(RPATH=env['GRAPHVIZ_RPATH'])      env.Append(RPATH=env['GRAPHVIZ_RPATH'])
2716    

Legend:
Removed from v.2356  
changed lines
  Added in v.2378

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