/[ascend]/trunk/base/generic/solver/SConscript
ViewVC logotype

Diff of /trunk/base/generic/solver/SConscript

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

revision 1785 by jpye, Mon Feb 11 05:49:51 2008 UTC revision 1786 by jpye, Sat Jun 7 06:17:35 2008 UTC
# Line 17  def c_escape(str): Line 17  def c_escape(str):
17          return re.sub("\\\\","/",str)          return re.sub("\\\\","/",str)
18    
19    
20  solver_env = libascend_env.Copy()  solver_env = libascend_env.Clone()
21    
22  solver_env['SUBST_DICT'] = {  solver_env['SUBST_DICT'] = {
23      '@ASC_WITH_CONOPT@':str(int('CONOPT' in libascend_env['WITH_SOLVERS']))      '@ASC_WITH_CONOPT@':str(int('CONOPT' in libascend_env['WITH_SOLVERS']))
# Line 30  solver_env['SUBST_DICT'] = { Line 30  solver_env['SUBST_DICT'] = {
30  solverconfig = solver_env.SubstInFile('conoptconfig.h.in')  solverconfig = solver_env.SubstInFile('conoptconfig.h.in')
31    
32  if 'CONOPT' in libascend_env['WITH_SOLVERS']:  if 'CONOPT' in libascend_env['WITH_SOLVERS']:
33      conopt_env = solver_env.Copy()      conopt_env = solver_env.Clone()
34    
35      if libascend_env.get('CONOPT_LINKED'):      if libascend_env.get('CONOPT_LINKED'):
36          # and then we must give the ldflags back to libascend for linking.          # and then we must give the ldflags back to libascend for linking.

Legend:
Removed from v.1785  
changed lines
  Added in v.1786

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