Skip to content

Commit

Permalink
SConstruct : Add option to set USG_SHIMLIB_PATH for nuke tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ivanimanishi committed Nov 6, 2024
1 parent 6ac8fc2 commit 1b9f885
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Build
- Added `PYBIND11_INCLUDE_PATH` option.
- Added `VDB_PYTHON_PATH` to USD tests.
- Added `INSTALL_CREATE_SYMLINKS`, which allows you to disable the creation of version symlinks at the end of the install.
- Added `USG_SHIMLIB_PATH` which may be necessary to run nuke tests.

- CI :
- IECoreHoudini tests updated to pass on newer environments.
Expand Down
8 changes: 8 additions & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,13 @@ o.Add(
"",
)

o.Add(
"USG_SHIMLIB_PATH",
"The path to the FnUsdShim to use for Nuke. This may be necessary to run the tests.",
"",
)


# OpenGL options

try :
Expand Down Expand Up @@ -2589,6 +2596,7 @@ 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] )
nukeTestEnv["ENV"]["USG_SHIMLIB_PATH"] = nukeTestEnv["USG_SHIMLIB_PATH"]

if doConfigure :

Expand Down

0 comments on commit 1b9f885

Please sign in to comment.