/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 742 by johnpye, Thu Jul 6 13:47:41 2006 UTC revision 743 by johnpye, Thu Jul 6 14:22:26 2006 UTC
# Line 541  class KeepContext: Line 541  class KeepContext:
541              self.keep[k]=context.env.get(k)              self.keep[k]=context.env.get(k)
542                    
543          if context.env.has_key(varprefix+'_CPPPATH'):          if context.env.has_key(varprefix+'_CPPPATH'):
544              context.env.Append(CPPPATH=[env[varprefix+'_CPPPATH']])              context.env.AppendUnique(CPPPATH=[env[varprefix+'_CPPPATH']])
545              #print "Adding '"+str(cpppath_add)+"' to cpp path"              #print "Adding '"+str(cpppath_add)+"' to cpp path"
546    
547          if static:          if static:
# Line 762  def CheckIDA(context): Line 762  def CheckIDA(context):
762      # add SUNDIALS subdirectories as well (what a pain)      # add SUNDIALS subdirectories as well (what a pain)
763      if context.env.get('IDA_CPPPATH'):      if context.env.get('IDA_CPPPATH'):
764          extra = [context.env['IDA_CPPPATH']+"/ida",context.env['IDA_CPPPATH']+"/sundials"]          extra = [context.env['IDA_CPPPATH']+"/ida",context.env['IDA_CPPPATH']+"/sundials"]
765          context.env.Append(CPPPATH=extra)          context.env.AppendUnique(CPPPATH=extra)
766            
767      if ',' in context.env.get('IDA_LIB'):      if ',' in context.env.get('IDA_LIB'):
768          context.env['IDA_LIB']=context.env['IDA_LIB'].split(',')          context.env['IDA_LIB']=context.env['IDA_LIB'].split(',')
# Line 1267  SConsEnvironment.InstallShared = lambda Line 1267  SConsEnvironment.InstallShared = lambda
1267  # BUILD...  # BUILD...
1268    
1269  # so that #include <modulename/headername.h> works across all modules...  # so that #include <modulename/headername.h> works across all modules...
1270  env.Append(CPPPATH=['#base/generic'])  env.AppendUnique(CPPPATH=['#base/generic'])
1271    
1272  if env['DEBUG']:  if env['DEBUG']:
1273      env.Append(CCFLAGS=['-g'])      env.Append(CCFLAGS=['-g'])

Legend:
Removed from v.742  
changed lines
  Added in v.743

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