File tree Expand file tree Collapse file tree 1 file changed +13
-1
lines changed
share/cmake/modules/install Expand file tree Collapse file tree 1 file changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -79,7 +79,18 @@ if(NOT OpenEXR_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PACK
7979
8080 set (_OpenEXR_LIB_VER "${_OpenEXR_VERSION_MAJOR} _${_OpenEXR_VERSION_MINOR} " )
8181
82- set (openjph_LIBRARY "${_EXT_DIST_ROOT} /${CMAKE_INSTALL_LIBDIR} /${CMAKE_STATIC_LIBRARY_PREFIX} openjph${CMAKE_STATIC_LIBRARY_SUFFIX} " )
82+ # Specify which OpenJPH version to use.
83+ set (openjph_VERSION_MAJOR 0)
84+ set (openjph_VERSION_MINOR 23)
85+ set (openjph_VERSION_PATCH 1)
86+ set (openjph_VERSION "${openjph_VERSION_MAJOR} .${openjph_VERSION_MINOR} .${openjph_VERSION_PATCH} " )
87+
88+ if (MSVC )
89+ set (openjph_LIBRARY "${_EXT_DIST_ROOT} /${CMAKE_INSTALL_LIBDIR} /${CMAKE_STATIC_LIBRARY_PREFIX} openjph.${openjph_VERSION_MAJOR} .${openjph_VERSION_MINOR}${_OpenEXR_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} " )
90+ else ()
91+ set (openjph_LIBRARY "${_EXT_DIST_ROOT} /${CMAKE_INSTALL_LIBDIR} /${CMAKE_STATIC_LIBRARY_PREFIX} openjph${_OpenEXR_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} " )
92+ endif ()
93+
8394 set_target_location(Iex)
8495 set_target_location(IlmThread)
8596 set_target_location(OpenEXR)
@@ -115,6 +126,7 @@ if(NOT OpenEXR_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PACK
115126 -DOPENEXR_BUILD_TOOLS=OFF
116127 -DOPENEXR_FORCE_INTERNAL_DEFLATE=ON
117128 -DOPENEXR_FORCE_INTERNAL_OPENJPH=ON
129+ -DOPENEXR_OPENJPH_TAG=${openjph_VERSION}
118130 # Try to use in-source built Imath first, if available.
119131 -DCMAKE_PREFIX_PATH=${_EXT_DIST_ROOT}
120132 )
You can’t perform that action at this time.
0 commit comments