Skip to content

Commit 7b9b140

Browse files
authored
build(jxl): Use correct cmake variables for the include directories (#4813)
There was feedback[1] in the prior commit that the changes were a bit atypical when it comes to cmake conventions. This is a partial revert of 5ca82dc to better align with conventions but still fix the problem. [1] #4810 (comment) Signed-off-by: Jesse Yurkovich <[email protected]>
1 parent b8fe261 commit 7b9b140

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/cmake/modules/FindJXL.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@ find_package_handle_standard_args(JXL
4141

4242
if(JXL_FOUND)
4343
set(JXL_LIBRARIES ${JXL_LIBRARY} ${JXL_THREADS_LIBRARY})
44+
set(JXL_INCLUDES ${JXL_INCLUDE_DIR})
4445
endif(JXL_FOUND)

src/jpegxl.imageio/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
if (JXL_FOUND)
66
add_oiio_plugin (jxlinput.cpp jxloutput.cpp
7-
INCLUDE_DIRS ${JXL_INCLUDE_DIR}
7+
INCLUDE_DIRS ${JXL_INCLUDES}
88
LINK_LIBRARIES ${JXL_LIBRARIES}
99
DEFINITIONS "USE_JXL")
1010
else()

0 commit comments

Comments
 (0)