Skip to content

Commit 5c40b8c

Browse files
committed
build: ensure libuhdr build recipe points to correct JPEG package
Signed-off-by: loicvital <[email protected]>
1 parent 2a5fc74 commit 5c40b8c

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/cmake/build_libuhdr.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ build_dependency_with_cmake(libuhdr
2222
-D CMAKE_INSTALL_LIBDIR=lib
2323
-D CMAKE_POSITION_INDEPENDENT_CODE=ON
2424
-D UHDR_BUILD_EXAMPLES=FALSE
25+
-D UHDR_BUILD_DEPS=FALSE
2526
-D UHDR_ENABLE_LOGS=TRUE
27+
-D JPEG_ROOT=${libjpeg-turbo_ROOT}
2628
)
2729

2830
if (WIN32)

src/jpeg.imageio/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
if (libuhdr_FOUND)
66
set (UHDR_DEFS USE_UHDR)
7+
else ()
8+
set (LIBUHDR_INCLUDE_DIR "")
9+
set (LIBUHDR_LIBRARY "")
10+
set (UHDR_DEFS "")
711
endif ()
812

913
add_oiio_plugin (jpeginput.cpp jpegoutput.cpp
@@ -12,5 +16,5 @@ add_oiio_plugin (jpeginput.cpp jpegoutput.cpp
1216
$<TARGET_NAME_IF_EXISTS:libjpeg-turbo::jpeg>
1317
$<TARGET_NAME_IF_EXISTS:JPEG::JPEG>
1418
${LIBUHDR_LIBRARY}
15-
DEFINITIONS ${UHDR_DEFS}
19+
DEFINITIONS "${UHDR_DEFS}"
1620
)

0 commit comments

Comments
 (0)