build: ensure libuhdr build recipe points to correct JPEG package

Signed-off-by: loicvital <[email protected]>

Author: mugulmd

src/cmake/build_libuhdr.cmake

@@ -13,6 +13,17 @@ set (libuhdr_GIT_TAG "v${libuhdr_BUILD_VERSION}")
 set_cache (libuhdr_BUILD_SHARED_LIBS OFF
            DOC "Should execute a local libuhdr build, if necessary, build shared libraries" ADVANCED)
 
+# CI debugging
+if (TARGET libjpeg-turbo::jpeg)
+    get_target_property(JPEG_INCLUDE_DIRS JPEG::JPEG INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(JPEG_LIBRARIES JPEG::JPEG INTERFACE_LINK_LIBRARIES)
+endif ()
+set (MORE_UHDR_CMAKE_ARGS
+     -D JPEG_INCLUDE_DIRS=${JPEG_INCLUDE_DIRS}
+     -D JPEG_LIBRARIES=${JPEG_LIBRARIES}
+     -D JPEG_FOUND=TRUE )
+message("[libuhdr] more uhdr cmake args: ${MORE_UHDR_CMAKE_ARGS}")
+
 build_dependency_with_cmake(libuhdr
     VERSION         ${libuhdr_BUILD_VERSION}
     GIT_REPOSITORY  ${libuhdr_GIT_REPOSITORY}
@@ -22,7 +33,9 @@ build_dependency_with_cmake(libuhdr
         -D CMAKE_INSTALL_LIBDIR=lib
         -D CMAKE_POSITION_INDEPENDENT_CODE=ON
         -D UHDR_BUILD_EXAMPLES=FALSE
+        -D UHDR_BUILD_DEPS=FALSE
         -D UHDR_ENABLE_LOGS=TRUE
+        ${MORE_UHDR_CMAKE_ARGS}
     )
 
 if (WIN32)

src/cmake/externalpackages.cmake

@@ -86,6 +86,10 @@ else ()
 endif ()
 
 
+# Ultra HDR
+checked_find_package (libuhdr)
+
+
 checked_find_package (TIFF REQUIRED
                       VERSION_MIN 4.0)
 alias_library_if_not_exists (TIFF::TIFF TIFF::tiff)
@@ -226,10 +230,6 @@ checked_find_package (fmt REQUIRED
 get_target_property(FMT_INCLUDE_DIR fmt::fmt-header-only INTERFACE_INCLUDE_DIRECTORIES)
 
 
-# Ultra HDR
-checked_find_package (libuhdr)
-
-
 ###########################################################################
 
 list (SORT CFP_ALL_BUILD_DEPS_FOUND COMPARE STRING CASE INSENSITIVE)

src/jpeg.imageio/CMakeLists.txt

@@ -4,6 +4,10 @@
 
 if (libuhdr_FOUND)
     set (UHDR_DEFS USE_UHDR)
+else ()
+    set (LIBUHDR_INCLUDE_DIR "")
+    set (LIBUHDR_LIBRARY "")
+    set (UHDR_DEFS "")
 endif ()
 
 add_oiio_plugin (jpeginput.cpp jpegoutput.cpp
@@ -12,5 +16,5 @@ add_oiio_plugin (jpeginput.cpp jpegoutput.cpp
                      $<TARGET_NAME_IF_EXISTS:libjpeg-turbo::jpeg>
                      $<TARGET_NAME_IF_EXISTS:JPEG::JPEG>
                      ${LIBUHDR_LIBRARY}
-                 DEFINITIONS ${UHDR_DEFS}
+                 DEFINITIONS "${UHDR_DEFS}"
                  )