Skip to content

Commit 2f811ed

Browse files
committed
IE Options : Respect IECORE_RTLD_GLOBAL during tests
1 parent b5c41b5 commit 2f811ed

File tree

1 file changed

+25
-22
lines changed

1 file changed

+25
-22
lines changed

config/ie/options

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -431,28 +431,31 @@ DOXYGEN = os.path.join( "/software/apps/doxygen", os.environ["DOXYGEN_VERSION"],
431431
os.environ["OCIO"] = "/software/config/openColorIO/nuke-default/config.ocio"
432432

433433
# import vars we need to get our doxygen and python wrappers working
434-
envVarsToImport = ["PATH",
435-
"COMPILER",
436-
"COMPILER_VERSION",
437-
"PYTHONPATH",
438-
"IEENV_ROOT",
439-
"IEENV_WORKING_PATH",
440-
"IEENV_LIBRARY_PREFIX_PATH",
441-
"DOXYGEN_VERSION",
442-
"IEENV_DEBUG",
443-
"IEENV_DEBUG_PYTHON",
444-
"IEENV_DEBUGGER",
445-
"IEENV_DEBUGGER_ARGS",
446-
"DELIGHT_CONF",
447-
"SCONS_VERSION",
448-
"DL_VERSION",
449-
"DL_SHADERS_PATH",
450-
"DL_DISPLAYS_PATH",
451-
"solidangle_LICENSE",
452-
"CORTEX_POINTDISTRIBUTION_TILESET",
453-
"OCIO",
454-
"IECORE_DEBUG_WAIT",
455-
"CORTEX_PERFORMANCE_TEST"]
434+
envVarsToImport = [
435+
"PATH",
436+
"COMPILER",
437+
"COMPILER_VERSION",
438+
"PYTHONPATH",
439+
"IEENV_ROOT",
440+
"IEENV_WORKING_PATH",
441+
"IEENV_LIBRARY_PREFIX_PATH",
442+
"DOXYGEN_VERSION",
443+
"IEENV_DEBUG",
444+
"IEENV_DEBUG_PYTHON",
445+
"IEENV_DEBUGGER",
446+
"IEENV_DEBUGGER_ARGS",
447+
"DELIGHT_CONF",
448+
"SCONS_VERSION",
449+
"DL_VERSION",
450+
"DL_SHADERS_PATH",
451+
"DL_DISPLAYS_PATH",
452+
"solidangle_LICENSE",
453+
"CORTEX_POINTDISTRIBUTION_TILESET",
454+
"OCIO",
455+
"IECORE_DEBUG_WAIT",
456+
"CORTEX_PERFORMANCE_TEST",
457+
"IECORE_RTLD_GLOBAL",
458+
]
456459

457460
ENV_VARS_TO_IMPORT= " ".join(envVarsToImport)
458461

0 commit comments

Comments
 (0)