/[ascend]/trunk/scons/graphviz.py
ViewVC logotype

Diff of /trunk/scons/graphviz.py

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

revision 2425 by jpye, Wed Mar 23 05:17:07 2011 UTC revision 2426 by jpye, Wed Mar 23 05:24:32 2011 UTC
# Line 39  def generate(env): Line 39  def generate(env):
39              env['HAVE_GRAPHVIZ'] = True              env['HAVE_GRAPHVIZ'] = True
40                                                                            
41          else:          else:
42                env1 = env.Clone()
43                env1['CPPPATH'] = None
44                env1['LIBPATH'] = None
45                env1['LIBS'] = None
46              try:              try:
47                  cmd = ['pkg-config','libgvc','libagraph','--cflags','--libs']                  cmd = ['pkg-config','libgvc','libcgraph','--cflags','--libs']
                 env1 = env.Clone()  
                 env1['CPPPATH'] = None  
                 env1['LIBPATH'] = None  
                 env1['LIBS'] = None  
48                  env1.ParseConfig(cmd)                  env1.ParseConfig(cmd)
49                    # we might get an error from this with older versions of GraphViz, so failover to below...
50                  env['GRAPHVIZ_CPPPATH'] = env1.get('CPPPATH')                  env['GRAPHVIZ_CPPPATH'] = env1.get('CPPPATH')
51                  env['GRAPHVIZ_LIBPATH'] = env1.get('LIBPATH')                  env['GRAPHVIZ_LIBPATH'] = env1.get('LIBPATH')
52                  env['GRAPHVIZ_LIBS'] = env1.get('LIBS')                  env['GRAPHVIZ_LIBS'] = env1.get('LIBS')
53                  env['HAVE_GRAPHVIZ'] = True                  env['HAVE_GRAPHVIZ'] = True
54              except:              except:
55                  cmd = ['pkg-config','libgvc','libcgraph','--cflags','--libs']                  cmd = ['pkg-config','libgvc','libagraph','--cflags','--libs']
                 env1 = env.Clone()  
                 env1['CPPPATH'] = None  
                 env1['LIBPATH'] = None  
                 env1['LIBS'] = None  
56                  env1.ParseConfig(cmd)                  env1.ParseConfig(cmd)
57                  env['GRAPHVIZ_CPPPATH'] = env1.get('CPPPATH')                  env['GRAPHVIZ_CPPPATH'] = env1.get('CPPPATH')
58                  env['GRAPHVIZ_LIBPATH'] = env1.get('LIBPATH')                  env['GRAPHVIZ_LIBPATH'] = env1.get('LIBPATH')

Legend:
Removed from v.2425  
changed lines
  Added in v.2426

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