/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1733 by jpye, Wed Feb 6 00:18:31 2008 UTC revision 1734 by jpye, Wed Feb 6 01:22:28 2008 UTC
# Line 160  opts.Add(ListOption( Line 160  opts.Add(ListOption(
160      ,"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"  
161          +" works. The option 'LSOD' is provided for backwards compatibility"          +" works. The option 'LSOD' is provided for backwards compatibility"
162          +"; the value 'LSODE' is preferred."          +"; the value 'LSODE' is preferred."
163      ,["QRSLV","CMSLV","LSODE","IDA","CONOPT","LRSLV","TRON","IPOPT"]      ,["QRSLV","CMSLV","LSODE","IDA","CONOPT","LRSLV","TRON","IPOPT","DOPRI5"]
164      ,['QRSLV','MPS','SLV','OPTSQP'      ,['QRSLV','MPS','SLV','OPTSQP'
165          ,'NGSLV','CMSLV','LRSLV','MINOS','CONOPT'          ,'NGSLV','CMSLV','LRSLV','MINOS','CONOPT'
166          ,'LSODE','LSOD','OPTSQP',"IDA","TRON","IPOPT"          ,'LSODE','LSOD','OPTSQP',"IDA","TRON","IPOPT","DOPRI5"
167       ]       ]
168  ))  ))
169    
# Line 887  if platform.system()=="Windows": Line 887  if platform.system()=="Windows":
887  else:  else:
888      with_installer=0      with_installer=0
889      without_installer_reason = "only possible under Windows"      without_installer_reason = "only possible under Windows"
           
 if 'LSODE' in env['WITH_SOLVERS']:  
     with_lsode=True  
 else:  
     with_lsode=False  
     without_lsode_reason = "not requested (WITH_SOLVERS)"  
       
 if 'IDA' in env['WITH_SOLVERS']:  
     with_ida=True  
 else:  
     with_ida=False  
     without_ida_reason = "not requested (WITH_SOLVERS)"  
890    
891    with_lsode = 'LSODE' in env['WITH_SOLVERS']
892    without_lsode_reason = "Not selected (see config option WITH_SOLVERS)"
893    
894  if 'CONOPT' in env['WITH_SOLVERS']:  with_ida = 'IDA' in env['WITH_SOLVERS']
895      with_conopt=True  without_ida_reason = "Not selected (see config option WITH_SOLVERS)"
 else:  
     with_conopt=False  
     without_conopt_reason = "not requested (WITH_SOLVERS)"  
896    
897  if 'IPOPT' in env['WITH_SOLVERS']:  with_dopri5 = 'DOPRI5' in env['WITH_SOLVERS']
898      with_ipopt=True  without_dopri5_reason = "Not selected (see config option WITH_SOLVERS)"
899  else:  
900      with_ipopt=False  with_conopt = 'CONOPT' in env['WITH_SOLVERS']
901      without_ipopt_reason = "not requested (WITH_SOLVERS)"  without_conopt_reason = "Not selected (see config option WITH_SOLVERS)"
902    
903    with_ipopt = 'IPOPT' in env['WITH_SOLVERS']
904    without_ipopt_reason = "Not selected (see config option WITH_SOLVERS)"
905    
906    
907  #print "SOLVERS:",env['WITH_SOLVERS']  #print "SOLVERS:",env['WITH_SOLVERS']
# Line 2206  if with_ufsparse: Line 2196  if with_ufsparse:
2196    
2197  # IDA  # IDA
2198    
2199  if not with_ida:  if with_ida:
2200      without_ida_reason = "Not selected (see config option WITH_SOLVERS)"      if not conf.CheckSUNDIALS():
2201  elif not conf.CheckSUNDIALS():          with_ida = False
2202      with_ida = False          without_ida_reason = "SUNDIALS not found, or bad version"
2203      without_ida_reason = "SUNDIALS not found, or bad version"      elif not conf.CheckIDA():
2204  elif not conf.CheckIDA():          with_ida = False
2205      with_ida = False          without_ida_reason = "Unable to compile/link against SUNDIALS/IDA"
     without_ida_reason = "Unable to compile/link against SUNDIALS/IDA"  
2206    
2207  # CONOPT  # CONOPT
2208    
# Line 2483  if with_conopt: Line 2472  if with_conopt:
2472  if with_ipopt:  if with_ipopt:
2473      env.Append(WITH_IPOPT=1)      env.Append(WITH_IPOPT=1)
2474    
2475    if with_dopri5:
2476        env.Append(WITH_DOPRI5=1)
2477    
2478  if with_graphviz and env.get('GRAPHVIZ_RPATH'):  if with_graphviz and env.get('GRAPHVIZ_RPATH'):
2479      env.Append(RPATH=env['GRAPHVIZ_RPATH'])      env.Append(RPATH=env['GRAPHVIZ_RPATH'])
2480    
# Line 2532  else: Line 2524  else:
2524  if not with_ida:  if not with_ida:
2525      print "Skipping... IDA won't be built:", without_ida_reason      print "Skipping... IDA won't be built:", without_ida_reason
2526    
2527    if not with_dopri5:
2528        print "Skipping... DOPRI5 won't be built:", without_dopri5_reason
2529    
2530  if with_mmio:  if with_mmio:
2531      srcs += env.SConscript(['mmio/SConscript'],'env')      srcs += env.SConscript(['mmio/SConscript'],'env')
2532  else:  else:
Legend:
Removed from v.1733  
changed lines
  Added in v.1734
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22