/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1717 by jpye, Wed Jan 9 05:12:20 2008 UTC revision 1718 by jpye, Wed Jan 9 05:19:19 2008 UTC
# Line 655  opts.Add( Line 655  opts.Add(
655      ,['gvc','graph','cdt']      ,['gvc','graph','cdt']
656  )  )
657    
658    opts.Add(PackageOption(
659        'GRAPHVIZ_RPATH'
660        ,"What is your GRAPHVIZ rpath for locating libraries at runtime?"
661        ,default_libpath
662    ))
663    
664  opts.Add(BoolOption(  opts.Add(BoolOption(
665      'WITH_GRAPHVIZ'      'WITH_GRAPHVIZ'
666      ,"Link to the GRAPHVIZ library (if available, for generating incidence graphs)"      ,"Link to the GRAPHVIZ library (if available, for generating incidence graphs)"
# Line 2432  if with_conopt: Line 2438  if with_conopt:
2438  if with_ipopt:  if with_ipopt:
2439      env.Append(WITH_IPOPT=1)      env.Append(WITH_IPOPT=1)
2440    
2441    if with_graphviz:
2442        env.Append(RPATH=env['GRAPHVIZ_RPATH'])
2443    
2444  #-------------  #-------------
2445  # TCL/TK GUI  # TCL/TK GUI
2446    
# Line 2491  if with_dmalloc: Line 2500  if with_dmalloc:
2500  if with_ufsparse:  if with_ufsparse:
2501      libascend_env.Append(LIBS=['cxsparse'])      libascend_env.Append(LIBS=['cxsparse'])
2502    
 if with_graphviz:  
     if len(env['GRAPHVIZ_LIBPATH']) and \  
             platform.system()=="Linux" and \  
             env.subst(env['GRAPHVIZ_LIBPATH'][0])=="/usr/lib/graphviz":  
         env.Append(RPATH=env['GRAPHVIZ_LIBPATH'])  
   
2503  libascend = libascend_env.SharedLibrary('ascend',srcs)  libascend = libascend_env.SharedLibrary('ascend',srcs)
2504    
2505  # for use in declaring dependent shared libraries in SConscript files (eg solvers/*/SConscript)  # for use in declaring dependent shared libraries in SConscript files (eg solvers/*/SConscript)

Legend:
Removed from v.1717  
changed lines
  Added in v.1718

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