Skip to content

ci: Bump auto-build libuhdr to 1.5.1, use static if found #5418

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

Open
lgritz wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −3
Open

ci: Bump auto-build libuhdr to 1.5.1, use static if found #5418

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 src/cmake/build_libuhdr.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
# libuhdr by hand!
######################################################################

set_cache (libuhdr_BUILD_VERSION 1.4.0 "libultrahdr version for local builds")
set_cache (libuhdr_BUILD_VERSION 1.5.1 "libultrahdr version for local builds")
set (libuhdr_GIT_REPOSITORY "https://github.com/google/libultrahdr")
set (libuhdr_GIT_TAG "v${libuhdr_BUILD_VERSION}")
set (libuhdr_GIT_COMMIT "d52a0d13814ca399fc8a07e23de1d2c63f0e8404")
set (libuhdr_GIT_COMMIT "a8166d65171aef43cb4bc211538ee6619a9af680")

set_cache (libuhdr_BUILD_SHARED_LIBS OFF
DOC "Should execute a local libuhdr build, if necessary, build shared libraries" ADVANCED)
Expand Down Expand Up @@ -49,6 +49,12 @@ build_dependency_with_cmake(libuhdr
-D JPEG_LIBRARY=${JPEG_LIBRARY}
-D CMAKE_C_COMPILER=${UHDR_CMAKE_C_COMPILER}
-D CMAKE_CXX_COMPILER=${UHDR_CMAKE_CXX_COMPILER}
# On MSVC, libuhdr's own CMakeLists forces a static (/MT) CRT for a
# static-lib build unless BUILD_FOR_WINUI is set, which instead lets
# our CMAKE_MSVC_RUNTIME_LIBRARY (passed down by
# build_dependency_with_cmake) flow through -- needed so uhdr-static
# links against the same CRT as the rest of OIIO.
-D BUILD_FOR_WINUI=TRUE
${_libuhdr_noinstall}
)
unset (_libuhdr_noinstall)
Expand Down
5 changes: 4 additions & 1 deletion src/cmake/modules/Findlibuhdr.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ find_path(LIBUHDR_INCLUDE_DIR
include
)

find_library(LIBUHDR_LIBRARY uhdr
find_library(LIBUHDR_LIBRARY
NAMES
uhdr
uhdr-static
PATH_SUFFIXES
lib
)
Expand Down
Loading