/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 450 by johnpye, Wed Apr 5 01:32:45 2006 UTC revision 451 by johnpye, Wed Apr 5 05:14:20 2006 UTC
# Line 112  opts.Add(PackageOption( Line 112  opts.Add(PackageOption(
112  opts.Add(PackageOption(  opts.Add(PackageOption(
113      'CUNIT_LIBPATH'      'CUNIT_LIBPATH'
114      ,"Where are your CUnit libraries?"      ,"Where are your CUnit libraries?"
115      ,"off"      ,"/usr/local/lib"
116  ))  ))
117    
118  # Where are the Tcl includes?  # Where are the Tcl includes?
# Line 327  def CheckExtLib(context,libname,text,ext Line 327  def CheckExtLib(context,libname,text,ext
327  #   print "TryLink with LIBPATH="+str(context.env['LIBPATH'])  #   print "TryLink with LIBPATH="+str(context.env['LIBPATH'])
328    
329      if not context.env.has_key(varprefix+'_LIB'):      if not context.env.has_key(varprefix+'_LIB'):
330          context.env.AppendUnique(LIBS=libname)          context.env.Append(LIBS=libname)
331    
332      is_ok = context.TryLink(text,ext)      is_ok = context.TryLink(text,ext)
333            
# Line 346  def CheckExtLib(context,libname,text,ext Line 346  def CheckExtLib(context,libname,text,ext
346  # CUnit test  # CUnit test
347    
348  cunit_test_text = """  cunit_test_text = """
349  #include <CUnit/Cunit.h>  #include <CUnit/CUnit.h>
350  int maxi(int i1, int i2){  int maxi(int i1, int i2){
351      return (i1 > i2) ? i1 : i2;      return (i1 > i2) ? i1 : i2;
352  }  }
# Line 364  int main(void){ Line 364  int main(void){
364  """  """
365    
366  def CheckCUnit(context):  def CheckCUnit(context):
367      return context.CheckExtLib(context      return CheckExtLib(context,'cunit',cunit_test_text)
         ,'cunit'  
         ,cunit_test_text  
     )  
368    
369  #----------------  #----------------
370  # Tcl test  # Tcl test

Legend:
Removed from v.450  
changed lines
  Added in v.451

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