Skip to content

Allow building RV with older version of OIIO #1303

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 1 commit into from
Nov 1, 2022
Merged

Allow building RV with older version of OIIO #1303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,10 @@ o.Add(
"",
)

o.Add(
BoolVariable( "WITH_OIIO_UTIL", "Build with OpenImageIO_Util", True ),
)

# Blosc options

o.Add(
Expand Down Expand Up @@ -1858,13 +1862,14 @@ imageEnvPrepends = {
],
"LIBS" : [
"OpenImageIO$OIIO_LIB_SUFFIX",
"OpenImageIO_Util$OIIO_LIB_SUFFIX",
],
"CXXFLAGS" : [
"-DIECoreImage_EXPORTS",
systemIncludeArgument, "$OIIO_INCLUDE_PATH"
]
}
if imageEnv.get( "WITH_OIIO_UTIL", True ):
imageEnvPrepends["LIBS"].append( "OpenImageIO_Util$OIIO_LIB_SUFFIX" )

imageEnv.Prepend( **imageEnvPrepends )
# Windows uses PATH for to find libraries, we must append to it to make sure we don't overwrite existing PATH entries.
Expand Down Expand Up @@ -2216,11 +2221,12 @@ if env["WITH_GL"] and doConfigure :
os.path.basename( imageEnv.subst( "$INSTALL_LIB_NAME" ) ),
os.path.basename( sceneEnv.subst( "$INSTALL_LIB_NAME" ) ),
"OpenImageIO$OIIO_LIB_SUFFIX",
"OpenImageIO_Util$OIIO_LIB_SUFFIX",
"GLEW$GLEW_LIB_SUFFIX",
"boost_wave$BOOST_LIB_SUFFIX",
]
)
if glEnv.get( "WITH_OIIO_UTIL", True ):
glEnv.Append( LIBS = [ "OpenImageIO_Util$OIIO_LIB_SUFFIX", ] )

if env["PLATFORM"]=="darwin" :
glEnv.Append(
Expand Down
4 changes: 4 additions & 0 deletions config/ie/options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ oiioRoot = os.path.join( "/software", "apps", "OpenImageIO", oiioVersion, platfo
OIIO_INCLUDE_PATH = os.path.join( oiioRoot, "include" )
OIIO_LIB_PATH = os.path.join( oiioRoot, "lib64" )
OIIO_LIB_SUFFIX = IEEnv.BuildUtil.libSuffix( "OpenImageIO", oiioLibSuffix )
WITH_OIIO_UTIL = "true"

FREETYPE_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
FREETYPE_INCLUDE_PATH = "/usr/include/freetype2"
Expand Down Expand Up @@ -436,6 +437,9 @@ if targetApp=="rv" :
# the default `OIIO_INCLUDE_PATH` value.
OIIO_LIB_PATH = rvLibs
OIIO_LIB_SUFFIX = rvReg.get( "OpenImageIOLibSuffix", OIIO_LIB_SUFFIX )
# current version of OIIO used by RV doesn't include the Util library
# this variable will tell the build process to not require it
WITH_OIIO_UTIL = rvReg.get( "WithOpenImageIOUtil", WITH_OIIO_UTIL )

# find doxygen
DOXYGEN = os.path.join( "/software/apps/doxygen", os.environ["DOXYGEN_VERSION"], platform, "bin", "doxygen" )
Expand Down