/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1734 by jpye, Wed Feb 6 01:22:28 2008 UTC revision 1747 by jpye, Sun Feb 10 03:42:42 2008 UTC
# Line 314  opts.Add(PackageOption( Line 314  opts.Add(PackageOption(
314    
315  opts.Add(  opts.Add(
316      "CONOPT_LIB"      "CONOPT_LIB"
317      ,"Library linked to for CONOPT"      ,"Library linked to for CONOPT. This is the name of the CONOPT .so or DLL. On Windows it seems to be called 'copopt3' but on linux it seems to be called 'consub3'."
318      ,default_conopt_lib      ,default_conopt_lib
319  )  )
320    
# Line 338  opts.Add( Line 338  opts.Add(
338    
339  opts.Add(  opts.Add(
340      'CONOPT_DLPATH'      'CONOPT_DLPATH'
341      ,"What is the default search path that ASCEND should use when dlopening the CONOPT library at runtime?"      ,"Default (fallback) search path that ASCEND should use when dlopening the CONOPT library at runtime? This is only used if the conopt environment variable doesn't exist and doesn't point to a location where the DLL/SO is found.  This is in platform-specific form (paths with ';' separator in Windows, ':' separator on Linux)."
342      ,default_conopt_dlpath      ,default_conopt_dlpath
343  )  )
344    
345  opts.Add(  opts.Add(
346      'CONOPT_ENVVAR'      'CONOPT_ENVVAR'
347      ,"What environment variable should be used at runtime to override the default search location for CONOPT DLL/SO?"      ,"Name of the optional environment variable which will be used for the value of the searchpath for the CONOPT DLL/SO."
348      ,default_conopt_envvar      ,default_conopt_envvar
349  )  )
350    
# Line 2362  subst_dict = { Line 2362  subst_dict = {
2362      , '@ASC_DISTDIR_REL_BIN@' : default_rel_distdir      , '@ASC_DISTDIR_REL_BIN@' : default_rel_distdir
2363      , '@PYTHON@' : python_exe      , '@PYTHON@' : python_exe
2364      , '@PYVERSION@' : pyversion      , '@PYVERSION@' : pyversion
     , '@ASC_CONOPT_LIB@':env.get('CONOPT_LIB')  
     , '@ASC_CONOPT_ENVVAR@':env.get('CONOPT_ENVVAR')  
     , '@ASC_CONOPT_DLPATH@':c_escape(env.subst("$CONOPT_DLPATH"))  
2365      , '@SOURCE_ROOT@':c_escape(os.path.abspath(str(env.Dir("#"))))      , '@SOURCE_ROOT@':c_escape(os.path.abspath(str(env.Dir("#"))))
     , '@WITH_SOLVERS@':",".join(env.get('WITH_SOLVERS'))  
2366      , '@WITH_GRAPHVIZ@': str(int(env.get('WITH_GRAPHVIZ')))      , '@WITH_GRAPHVIZ@': str(int(env.get('WITH_GRAPHVIZ')))
2367  }  }
2368    
# Line 2376  if env.get('WITH_DOC'): Line 2372  if env.get('WITH_DOC'):
2372    
2373  # bool options...  # bool options...
2374  for k,v in {  for k,v in {
2375          'ASC_WITH_IDA':with_ida          'ASC_WITH_DMALLOC':with_dmalloc
         ,'ASC_WITH_DMALLOC':with_dmalloc  
2376          ,'ASC_WITH_UFSPARSE':with_ufsparse          ,'ASC_WITH_UFSPARSE':with_ufsparse
         ,'ASC_WITH_CONOPT':with_conopt  
         ,'ASC_LINKED_CONOPT':env.get('CONOPT_LINKED')  
         ,'ASC_WITH_IPOPT':with_ipopt  
         ,'ASC_WITH_LSODE':with_lsode  
2377          ,'ASC_WITH_MMIO':with_mmio          ,'ASC_WITH_MMIO':with_mmio
2378          ,'ASC_SIGNAL_TRAPS':with_signals          ,'ASC_SIGNAL_TRAPS':with_signals
2379          ,'ASC_RESETNEEDED':env.get('ASC_RESETNEEDED')          ,'ASC_RESETNEEDED':env.get('ASC_RESETNEEDED')

Legend:
Removed from v.1734  
changed lines
  Added in v.1747

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