Skip to content

Commit 505792c

Browse files
committed
Fixing IE options for non-3delight builds
1 parent 2940077 commit 505792c

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

config/ie/options

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ if PYTHON_LINK_FLAGS=="" :
226226
PYTHON_LINK_FLAGS = "-L" + pythonReg["location"] + "/" + compiler + "/" + compilerVersion + "/lib -lpython" + pythonVersion
227227

228228
# find 3delight. we only build the 3delight stuff if the compiler we're building with is suitable.
229+
dlReg = None
229230
dlVersion = getOption( "DL_VERSION", os.environ["DL_VERSION"] )
230231
try :
231232
dlReg = IEEnv.registry["apps"]["3delight"][dlVersion][platform]
@@ -360,7 +361,10 @@ DOXYGEN = os.path.join( "/software/apps/doxygen", os.environ["DOXYGEN_VERSION"],
360361
ENV_VARS_TO_IMPORT="PATH COMPILER COMPILER_VERSION PYTHONPATH IEENV_ROOT IEENV_WORKING_PATH IEENV_LIBRARY_PREFIX_PATH DOXYGEN_VERSION IEENV_DEBUG IEENV_DEBUG_PYTHON IEENV_DEBUGGER IEENV_DEBUGGER_ARGS DELIGHT_CONF SCONS_VERSION DL_VERSION DL_SHADERS_PATH DL_DISPLAYS_PATH"
361362

362363
# make sure the tests can run
363-
TEST_LIBPATH = ":".join( [ pythonReg["location"] + "/" + compiler + "/" + compilerVersion + "/lib", compilerReg["location"] + "/lib", dlReg["location"] + "/lib" ] )
364+
testLibs = [ pythonReg["location"] + "/" + compiler + "/" + compilerVersion + "/lib", compilerReg["location"] + "/lib" ]
365+
if dlReg :
366+
testLibs.append( dlReg["location"] + "/lib" )
367+
TEST_LIBPATH = ":".join( testLibs )
364368
TEST_LIBRARY_PATH_ENV_VAR = "IEENV_LIBRARY_PREFIX_PATH"
365369

366370
# install the op stubs and procedural stubs

0 commit comments

Comments
 (0)