Skip to content

Commit c347370

Browse files
committed
Bump OPENEXR_LIB_SOVERSION to 33 and pin Imath and OpenJPH
Signed-off-by: Cary Phillips <[email protected]>
1 parent 9fcb1b0 commit c347370

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ set(OPENEXR_VERSION_API "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}")
4343
# For example, in "libOpenEXR.so.31.3.2.0", "libOpenEXR.so.31" is the SONAME
4444
# and ".3.2.0" identifies the corresponding library release.
4545

46-
set(OPENEXR_LIB_SOVERSION 99)
46+
set(OPENEXR_LIB_SOVERSION 33)
4747
set(OPENEXR_LIB_VERSION "${OPENEXR_LIB_SOVERSION}.${OPENEXR_VERSION}") # e.g. "31.3.2.0"
4848

4949
if(OPENEXR_INSTALL OR OPENEXR_INSTALL_TOOLS OR OPENEXR_INSTALL_DEVELOPER_TOOLS)

cmake/OpenEXRSetup.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ endif()
257257

258258
option(OPENEXR_FORCE_INTERNAL_OPENJPH "Force downloading OpenJPH from a git repo" OFF)
259259
set(OPENEXR_OPENJPH_REPO "https://github.com/aous72/OpenJPH.git" CACHE STRING "OpenJPH git repo URI")
260-
set(OPENEXR_OPENJPH_TAG "master" CACHE STRING "OpenJPH git repo tag")
260+
set(OPENEXR_OPENJPH_TAG "0.22.0" CACHE STRING "OpenJPH git repo tag")
261261

262262
if (NOT OPENEXR_FORCE_INTERNAL_OPENJPH)
263263
find_package(openjph CONFIG QUIET)
@@ -337,7 +337,7 @@ set(EXR_OPENJPH_PKGCONFIG_REQUIRES "openjph >= 0.21.0")
337337
option(OPENEXR_FORCE_INTERNAL_IMATH "Force using an internal imath" OFF)
338338
# Check to see if Imath is installed outside of the current build directory.
339339
set(OPENEXR_IMATH_REPO "https://github.com/AcademySoftwareFoundation/Imath.git" CACHE STRING "Repo for auto-build of Imath")
340-
set(OPENEXR_IMATH_TAG "main" CACHE STRING "Tag for auto-build of Imath (branch, tag, or SHA)")
340+
set(OPENEXR_IMATH_TAG "v3.2.1" CACHE STRING "Tag for auto-build of Imath (branch, tag, or SHA)")
341341
if(NOT OPENEXR_FORCE_INTERNAL_IMATH)
342342
#TODO: ^^ Release should not clone from main, this is a place holder
343343
set(CMAKE_IGNORE_PATH "${CMAKE_CURRENT_BINARY_DIR}/_deps/imath-src/config;${CMAKE_CURRENT_BINARY_DIR}/_deps/imath-build/config")

0 commit comments

Comments
 (0)