/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 922 by johnpye, Wed Nov 8 05:25:37 2006 UTC revision 935 by johnpye, Fri Nov 24 00:37:11 2006 UTC
# Line 34  if platform.system()=="Windows": Line 34  if platform.system()=="Windows":
34      default_conopt_cpppath="$CONOPT_PREFIX"      default_conopt_cpppath="$CONOPT_PREFIX"
35      default_conopt_lib="conopt3"      default_conopt_lib="conopt3"
36      default_conopt_envvar="CONOPT_PATH"      default_conopt_envvar="CONOPT_PATH"
37    
38        default_cunit_prefix="c:\\MinGW"
39        default_cunit_libpath="$CUNIT_PREFIX\\lib"
40        default_cunit_cpppath="$CUNIT_PREFIX\\include"
41            
42      if not os.path.exists(default_conopt_prefix):      if not os.path.exists(default_conopt_prefix):
43          default_conopt_prefix = None          default_conopt_prefix = None
# Line 57  else: Line 61  else:
61      default_conopt_cpppath="$CONOPT_PREFIX/include"      default_conopt_cpppath="$CONOPT_PREFIX/include"
62      default_conopt_lib="consub3"      default_conopt_lib="consub3"
63      default_conopt_envvar="CONOPT_PATH"      default_conopt_envvar="CONOPT_PATH"
64        default_cunit_prefix="/usr"
65        default_cunit_libpath="$CUNIT_PREFIX/lib"
66        default_cunit_cpppath="$CUNIT_PREFIX/include"
67    
68      need_libm = True      need_libm = True
69      if not os.path.isdir(default_tcl):      if not os.path.isdir(default_tcl):
# Line 165  opts.Add(BoolOption( Line 172  opts.Add(BoolOption(
172      ,True      ,True
173  ))  ))
174    
175    # Where was CUNIT installed?
176    opts.Add(PackageOption(
177        'CUNIT_PREFIX'
178        ,"Where are your CUnit files?"
179        ,default_cunit_prefix
180    ))
181    
182  # Where are the CUnit includes?  # Where are the CUnit includes?
183  opts.Add(PackageOption(  opts.Add(PackageOption(
184      'CUNIT_CPPPATH'      'CUNIT_CPPPATH'
185      ,"Where are your CUnit include files?"      ,"Where are your CUnit include files?"
186      ,'off'      ,default_cunit_cpppath
187  ))  ))
188    
189  # Where are the CUnit libraries?  # Where are the CUnit libraries?
190  opts.Add(PackageOption(  opts.Add(PackageOption(
191      'CUNIT_LIBPATH'      'CUNIT_LIBPATH'
192      ,"Where are your CUnit libraries?"      ,"Where are your CUnit libraries?"
193      ,'off'      ,default_cunit_libpath
194  ))  ))
195    
196  opts.Add(PackageOption(  opts.Add(PackageOption(

Legend:
Removed from v.922  
changed lines
  Added in v.935

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