Skip to content

Commit ac909c7

Browse files
authored
Merge pull request #1370 from ivanimanishi/backportIeOptionsPostScripts
ie/options : ensure a valid environment for running post scripts
2 parents a9c029e + 01037d1 commit ac909c7

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
@@ -313,7 +313,11 @@ if targetApp=="maya" :
313313
INSTALL_MEL_DIR = os.path.join( appPrefix, "mel", "$IECORE_NAME" )
314314
INSTALL_MAYAPLUGIN_NAME = os.path.join( appPrefix, "plugins", "$IECORE_NAME" )
315315
INSTALL_MAYAICON_DIR = os.path.join( appPrefix, "icons" )
316-
INSTALL_COREMAYA_POST_COMMAND="scons -i -f config/ie/postCoreMayaInstall MAYA_VERSION='" + mayaVersion + "' INSTALLPREFIX="+appPrefix+" install"
316+
INSTALL_COREMAYA_POST_COMMAND="ieEnvExec {workingPath} scons -i -f config/ie/postCoreMayaInstall MAYA_VERSION='{mayaVersion}' INSTALLPREFIX={appPrefix} install".format(
317+
workingPath = os.environ["IEENV_WORKING_PATH"],
318+
mayaVersion = mayaVersion,
319+
appPrefix = appPrefix
320+
)
317321
WITH_MAYA_PLUGIN_LOADER = 1
318322

319323
mayaUsdVersion = mayaReg.get( "mayaUsdVersion" )
@@ -497,8 +501,12 @@ else :
497501
INSTALL_USDLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
498502

499503
# only installing for the base installation as the CORTEX_STARTUP_PATHS will load these within target apps as well
500-
INSTALL_CORESCENE_POST_COMMAND = "scons -i -f config/ie/postCoreSceneInstall INSTALLPREFIX={prefix} install".format( prefix = basePrefix )
501-
INSTALL_COREIMAGE_POST_COMMAND = "scons -i -f config/ie/postCoreImageInstall INSTALLPREFIX={prefix} install".format( prefix = basePrefix )
504+
INSTALL_CORESCENE_POST_COMMAND = "ieEnvExec {workingPath} scons -i -f config/ie/postCoreSceneInstall INSTALLPREFIX={prefix} install".format(
505+
workingPath = os.environ["IEENV_WORKING_PATH"], prefix = basePrefix
506+
)
507+
INSTALL_COREIMAGE_POST_COMMAND = "ieEnvExec {workingPath} scons -i -f config/ie/postCoreImageInstall INSTALLPREFIX={prefix} install".format(
508+
workingPath = os.environ["IEENV_WORKING_PATH"], prefix = basePrefix
509+
)
502510

503511
INSTALL_GLSL_HEADER_DIR = os.path.join( basePrefix, "glsl" )
504512
INSTALL_GLSL_SHADER_DIR = os.path.join( basePrefix, "glsl" )

0 commit comments

Comments
 (0)