/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1398 by jpye, Sun Apr 22 04:26:01 2007 UTC revision 1399 by jpye, Sun Apr 22 05:02:24 2007 UTC
# Line 32  if platform.system()=="Windows": Line 32  if platform.system()=="Windows":
32      default_conopt_prefix = "c:\\Program Files\\CONOPT"      default_conopt_prefix = "c:\\Program Files\\CONOPT"
33      default_conopt_libpath="$CONOPT_PREFIX"      default_conopt_libpath="$CONOPT_PREFIX"
34      default_conopt_cpppath="$CONOPT_PREFIX"      default_conopt_cpppath="$CONOPT_PREFIX"
35        default_conopt_dlpath="$CONOPT_PREFIX"
36      default_conopt_lib="conopt3"      default_conopt_lib="conopt3"
37      default_conopt_envvar="CONOPT_PATH"      default_conopt_envvar="CONOPT_PATH"
38    
# Line 59  else: Line 60  else:
60      default_conopt_prefix="/usr"      default_conopt_prefix="/usr"
61      default_conopt_libpath="$CONOPT_PREFIX/lib"      default_conopt_libpath="$CONOPT_PREFIX/lib"
62      default_conopt_cpppath="$CONOPT_PREFIX/include"      default_conopt_cpppath="$CONOPT_PREFIX/include"
63        default_conopt_dlpath= default_conopt_libpath + ":/usr/local/lib"
64      default_conopt_lib="consub3"      default_conopt_lib="consub3"
65      default_conopt_envvar="CONOPT_PATH"      default_conopt_envvar="CONOPT_PATH"
66    
# Line 267  opts.Add( Line 269  opts.Add(
269    
270  opts.Add(  opts.Add(
271      'CONOPT_LIBPATH'      'CONOPT_LIBPATH'
272      ,"Where is your CONOPT libraries installed?"      ,"Where is your CONOPT library installed?"
273      ,default_conopt_libpath      ,default_conopt_libpath
274  )  )
275    
276  opts.Add(  opts.Add(
277        'CONOPT_DLPATH'
278        ,"What is the default search path that ASCEND should use when dlopening the CONOPT library at runtime?"
279        ,default_conopt_dlpath
280    )
281    
282    opts.Add(
283      'CONOPT_ENVVAR'      'CONOPT_ENVVAR'
284      ,"What environment variable should be used at runtime to override the default search location for CONOPT DLL/SO?"      ,"What environment variable should be used at runtime to override the default search location for CONOPT DLL/SO?"
285      ,default_conopt_envvar      ,default_conopt_envvar
# Line 1823  subst_dict = { Line 1831  subst_dict = {
1831      , '@PYTHON@' : python_exe      , '@PYTHON@' : python_exe
1832      , '@ASC_CONOPT_LIB@':env.get('CONOPT_LIB')      , '@ASC_CONOPT_LIB@':env.get('CONOPT_LIB')
1833      , '@ASC_CONOPT_ENVVAR@':env.get('CONOPT_ENVVAR')      , '@ASC_CONOPT_ENVVAR@':env.get('CONOPT_ENVVAR')
1834      , '@ASC_CONOPT_DLPATH@':c_escape(env.subst("$CONOPT_LIBPATH"))      , '@ASC_CONOPT_DLPATH@':c_escape(env.subst("$CONOPT_DLPATH"))
1835      , '@SOURCE_ROOT@':c_escape(os.path.abspath(str(env.Dir("#"))))      , '@SOURCE_ROOT@':c_escape(os.path.abspath(str(env.Dir("#"))))
1836  }  }
1837    

Legend:
Removed from v.1398  
changed lines
  Added in v.1399

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