From 9351f3910d6cd8f7e360cfc6ab27cc24dbe7133e Mon Sep 17 00:00:00 2001 From: Lucien Fostier Date: Tue, 12 Apr 2022 18:43:31 -0700 Subject: [PATCH 1/2] Add support for nuke 13 custom OIIO build --- config/ie/options | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/ie/options b/config/ie/options index fc1e692dd9..5f85d31ede 100644 --- a/config/ie/options +++ b/config/ie/options @@ -122,6 +122,7 @@ if targetApp : pythonVersion = targetAppReg["pythonVersion"] boostVersion = targetAppReg.get( "boostVersion", cortexReg["boostVersion"] ) oiioVersion = targetAppReg.get( "OpenImageIOVersion", cortexReg["OpenImageIOVersion"] ) + oiioLibSuffix = targetAppReg.get( "OpenImageIOLibSuffix", oiioVersion ) tbbVersion = targetAppReg.get( "tbbVersion", cortexReg["tbbVersion"] ) usdVersion = targetAppReg.get( "usdVersion", cortexReg.get("usdVersion", None) ) targetAppMajorVersion = targetAppReg.get( "majorVersion", targetAppVersion ) @@ -145,6 +146,7 @@ else : usdVersion = cortexReg.get("usdVersion", None) boostVersion = cortexReg["boostVersion"] oiioVersion = cortexReg["OpenImageIOVersion"] + oiioLibSuffix = oiioVersion # get the compiler location using the registry compilerReg = IEEnv.registry["compilers"][compiler][compilerVersion][platform] @@ -192,7 +194,7 @@ GLEW_LIB_SUFFIX = IEEnv.BuildUtil.libSuffix( "glew", glewVersion ) oiioRoot = os.path.join( "/software", "apps", "OpenImageIO", oiioVersion, platform, compiler, compilerVersion ) OIIO_INCLUDE_PATH = os.path.join( oiioRoot, "include" ) OIIO_LIB_PATH = os.path.join( oiioRoot, "lib64" ) -OIIO_LIB_SUFFIX = IEEnv.BuildUtil.libSuffix( "OpenImageIO", oiioVersion ) +OIIO_LIB_SUFFIX = IEEnv.BuildUtil.libSuffix( "OpenImageIO", oiioLibSuffix ) FREETYPE_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion ) FREETYPE_INCLUDE_PATH = "/usr/include/freetype2" From 3aa98e9ee91fff0f954e8fa011efd14066a668cb Mon Sep 17 00:00:00 2001 From: Lucien Fostier Date: Thu, 5 May 2022 15:37:06 -0700 Subject: [PATCH 2/2] SConstruct: Prepend OIIO lib path to test env to support custom OIIO build. Nuke 13.2 requires OIIO build with boost 1.70.0 so we need to prepend the lib path to the LD_LIBRARY_PATH for this custom OIIO build to used as runtime. --- SConstruct | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SConstruct b/SConstruct index bcbccd2a62..3eac79cab3 100644 --- a/SConstruct +++ b/SConstruct @@ -2571,6 +2571,8 @@ nukeTestEnv["ENV"]["LM_LICENSE_FILE"] = nukeTestEnv["NUKE_LICENSE_FILE"] nukeTestEnv["ENV"]["foundry_LICENSE"] = nukeTestEnv["NUKE_LICENSE_FILE"] nukeTestEnv["ENV"]["NUKE_PATH"] = "plugins/nuke" nukeTestEnv["ENV"]["IECORE_OP_PATHS"] = "test/IECoreNuke/ops:test/IECore/ops" +# prepend OIIO LIB PATH to library path to support custom OIIO with specific dependencies +nukeTestEnv["ENV"][libraryPathEnvVar] = "{}:{}".format( nukeTestEnv.subst( "$OIIO_LIB_PATH" ), nukeTestEnv["ENV"][libraryPathEnvVar] ) if doConfigure :