Skip to content

Commit df31bd1

Browse files
authored
Merge pull request #1355 from ivanimanishi/ieOptionsPostScripts
ie/options : ensure a valid environment for running post scripts
2 parents a117338 + a11eca0 commit df31bd1

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

config/ie/options

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,11 @@ if targetApp=="maya" :
292292
INSTALL_MEL_DIR = os.path.join( appPrefix, "mel", "$IECORE_NAME" )
293293
INSTALL_MAYAPLUGIN_NAME = os.path.join( appPrefix, "plugins", "$IECORE_NAME" )
294294
INSTALL_MAYAICON_DIR = os.path.join( appPrefix, "icons" )
295-
INSTALL_COREMAYA_POST_COMMAND="scons -i -f config/ie/postCoreMayaInstall MAYA_VERSION='" + mayaVersion + "' INSTALLPREFIX="+appPrefix+" install"
295+
INSTALL_COREMAYA_POST_COMMAND="ieEnvExec {workingPath} scons -i -f config/ie/postCoreMayaInstall MAYA_VERSION='{mayaVersion}' INSTALLPREFIX={appPrefix} install".format(
296+
workingPath = os.environ["IEENV_WORKING_PATH"],
297+
mayaVersion = mayaVersion,
298+
appPrefix = appPrefix
299+
)
296300
WITH_MAYA_PLUGIN_LOADER = 1
297301

298302
mayaUsdVersion = mayaReg.get( "mayaUsdVersion" )
@@ -474,8 +478,12 @@ else :
474478
INSTALL_USDLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
475479

476480
# only installing for the base installation as the CORTEX_STARTUP_PATHS will load these within target apps as well
477-
INSTALL_CORESCENE_POST_COMMAND = "scons -i -f config/ie/postCoreSceneInstall INSTALLPREFIX={prefix} install".format( prefix = basePrefix )
478-
INSTALL_COREIMAGE_POST_COMMAND = "scons -i -f config/ie/postCoreImageInstall INSTALLPREFIX={prefix} install".format( prefix = basePrefix )
481+
INSTALL_CORESCENE_POST_COMMAND = "ieEnvExec {workingPath} scons -i -f config/ie/postCoreSceneInstall INSTALLPREFIX={prefix} install".format(
482+
workingPath = os.environ["IEENV_WORKING_PATH"], prefix = basePrefix
483+
)
484+
INSTALL_COREIMAGE_POST_COMMAND = "ieEnvExec {workingPath} scons -i -f config/ie/postCoreImageInstall INSTALLPREFIX={prefix} install".format(
485+
workingPath = os.environ["IEENV_WORKING_PATH"], prefix = basePrefix
486+
)
479487

480488
INSTALL_GLSL_HEADER_DIR = os.path.join( basePrefix, "glsl" )
481489
INSTALL_GLSL_SHADER_DIR = os.path.join( basePrefix, "glsl" )

0 commit comments

Comments
 (0)