/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 992 by johnpye, Thu Dec 21 03:56:26 2006 UTC revision 993 by johnpye, Fri Dec 22 11:03:51 2006 UTC
# Line 173  opts.Add(BoolOption( Line 173  opts.Add(BoolOption(
173      ,True      ,True
174  ))  ))
175    
176    # Build with MMIO matrix export support?
177    opts.Add(BoolOption(
178        'WITH_MMIO'
179        ,"Include support for exporting matrices in Matrix Market format"
180        ,True
181    ))
182    
183  #----- default paths -----  #----- default paths -----
184  opts.Add(PackageOption(  opts.Add(PackageOption(
185      'DEFAULT_PREFIX'      'DEFAULT_PREFIX'
# Line 597  without_scrollkeeper_reason = "disabled Line 604  without_scrollkeeper_reason = "disabled
604  with_dmalloc = env.get('WITH_DMALLOC')  with_dmalloc = env.get('WITH_DMALLOC')
605  without_dmalloc_reason = "disabled by options/config.py"  without_dmalloc_reason = "disabled by options/config.py"
606    
607    with_mmio = env.get('WITH_MMIO')
608    without_mmio_reason = "disabled by options/config.py"
609    
610  if platform.system()=="Windows":  if platform.system()=="Windows":
611      with_installer=1      with_installer=1
612  else:  else:
# Line 1650  if with_conopt: Line 1660  if with_conopt:
1660  if with_lsode:  if with_lsode:
1661      subst_dict["/\\* #define ASC_WITH_LSODE @ASC_WITH_LSODE@ \\*/"]='#define ASC_WITH_LSODE '      subst_dict["/\\* #define ASC_WITH_LSODE @ASC_WITH_LSODE@ \\*/"]='#define ASC_WITH_LSODE '
1662    
1663    if with_mmio:
1664        subst_dict["/\\* #define ASC_WITH_MMIO @ASC_WITH_MMIO@ \\*/"]='#define ASC_WITH_MMIO '
1665    
1666  if with_python:  if with_python:
1667      subst_dict['@ASCXX_USE_PYTHON@']="1"      subst_dict['@ASCXX_USE_PYTHON@']="1"
1668      env['WITH_PYTHON']=1;      env['WITH_PYTHON']=1;
# Line 1878  else: Line 1891  else:
1891  if not with_ida:  if not with_ida:
1892      print "Skipping... IDA won't be built:", without_ida_reason      print "Skipping... IDA won't be built:", without_ida_reason
1893    
1894    if with_mmio:
1895        srcs += env.SConscript(['mmio/SConscript'],'env')
1896    else:
1897        print "Skipping... MMIO export won't be built:", without_mmio_reason
1898  #-------------  #-------------
1899  # LIBASCEND -- all base/generic functionality  # LIBASCEND -- all base/generic functionality
1900    

Legend:
Removed from v.992  
changed lines
  Added in v.993

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