Skip to content

Commit 9351f39

Browse files
committed
Add support for nuke 13 custom OIIO build
1 parent b782062 commit 9351f39

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

config/ie/options

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ if targetApp :
122122
pythonVersion = targetAppReg["pythonVersion"]
123123
boostVersion = targetAppReg.get( "boostVersion", cortexReg["boostVersion"] )
124124
oiioVersion = targetAppReg.get( "OpenImageIOVersion", cortexReg["OpenImageIOVersion"] )
125+
oiioLibSuffix = targetAppReg.get( "OpenImageIOLibSuffix", oiioVersion )
125126
tbbVersion = targetAppReg.get( "tbbVersion", cortexReg["tbbVersion"] )
126127
usdVersion = targetAppReg.get( "usdVersion", cortexReg.get("usdVersion", None) )
127128
targetAppMajorVersion = targetAppReg.get( "majorVersion", targetAppVersion )
@@ -145,6 +146,7 @@ else :
145146
usdVersion = cortexReg.get("usdVersion", None)
146147
boostVersion = cortexReg["boostVersion"]
147148
oiioVersion = cortexReg["OpenImageIOVersion"]
149+
oiioLibSuffix = oiioVersion
148150

149151
# get the compiler location using the registry
150152
compilerReg = IEEnv.registry["compilers"][compiler][compilerVersion][platform]
@@ -192,7 +194,7 @@ GLEW_LIB_SUFFIX = IEEnv.BuildUtil.libSuffix( "glew", glewVersion )
192194
oiioRoot = os.path.join( "/software", "apps", "OpenImageIO", oiioVersion, platform, compiler, compilerVersion )
193195
OIIO_INCLUDE_PATH = os.path.join( oiioRoot, "include" )
194196
OIIO_LIB_PATH = os.path.join( oiioRoot, "lib64" )
195-
OIIO_LIB_SUFFIX = IEEnv.BuildUtil.libSuffix( "OpenImageIO", oiioVersion )
197+
OIIO_LIB_SUFFIX = IEEnv.BuildUtil.libSuffix( "OpenImageIO", oiioLibSuffix )
196198

197199
FREETYPE_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
198200
FREETYPE_INCLUDE_PATH = "/usr/include/freetype2"

0 commit comments

Comments
 (0)