Skip to content

Nuke13 custom dependencies #1263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivanimanishi merged 2 commits into from
May 18, 2022
Merged

Nuke13 custom dependencies #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9351f39
Add support for nuke 13 custom OIIO build
lucienfostier Apr 13, 2022
3aa98e9
SConstruct: Prepend OIIO lib path to test env to support custom OIIO …
lucienfostier May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 :

Expand Down
4 changes: 3 additions & 1 deletion config/ie/options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -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]
Expand Down Expand Up @@ -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"
Expand Down