Commit da3f8030 authored by fogal1's avatar fogal1

Switch "-x-args" to a RuntimeSetting.

Allows using an env var, which avoids all our argument parsing
code.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@14774 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5e42cd40
......@@ -100,7 +100,9 @@ const struct Setting s::settings[] = {
{"system-gl", lib_gl, true, "--system-gl-lib", "VISIT_GL_LIB",
"Library which implements OpenGL."},
{"tuvok-shader-dir", "./share/Shaders", true, "--tuvok-shaders",
"VISIT_TUVOK_SHADER_DIR", "Directory which holds Tuvok's GLSL shaders."}
"VISIT_TUVOK_SHADER_DIR", "Directory which holds Tuvok's GLSL shaders."},
{"x-args", "", false, "-x-args", "VISIT_X_ARGS",
"Arguments to pass to X servers that VisIt starts up."}
};
// Runtime modification map. This is where we'll put settings we figure out
......
......@@ -597,6 +597,7 @@ Engine::Initialize(int *argc, char **argv[], bool sigs)
// Configure external options.
RuntimeSetting::parse_command_line(*argc, const_cast<const char**>(*argv));
this->X_Args = RuntimeSetting::lookups("x-args");
//
// Set a different new handler for the engine
......@@ -1859,9 +1860,6 @@ Engine::ProcessInput()
// Tom Fogal, Fri Jul 11 11:55:43 EDT 2008
// Added `icet' command line parameter.
//
// Tom Fogal, Tue Aug 5 14:21:56 EDT 2008
// Add `x-args' command line parameter.
//
// Jeremy Meredith, Thu Aug 7 16:23:22 EDT 2008
// Wrap parallel-only vars with appropriate ifdef.
//
......@@ -1907,6 +1905,9 @@ Engine::ProcessInput()
// Tom Fogal, Wed May 26 09:27:36 MDT 2010
// Add -launch-x, -no-launch-x command line options.
//
// Tom Fogal, Wed May 26 09:56:08 MDT 2010
// Don't parse x-args here; use an RTS.
//
// ****************************************************************************
void
......@@ -1928,11 +1929,6 @@ Engine::ProcessCommandLine(int argc, char **argv)
if (this->nDisplays == 0)
this->nDisplays = 1;
}
else if (strcmp(argv[i], "-x-args") == 0 && i+1 < argc)
{
this->X_Args = std::string(argv[i+1]);
i++;
}
else if (strcmp(argv[i], "-n-gpus-per-node") == 0 && i+1 < argc)
{
if(!StringHelpers::str_to_u_numeric<size_t>(argv[i+1],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment