Skip to content

Commit dd08cd8

Browse files
committed
CMake: also find jconfig.h from libturbojpeg from arch-specific include directory
This header file is architecture-dependent and can be stored as: - /usr/include/i386-linux-gnu/jconfig.h - /usr/include/x86_64-linux-gnu/jconfig.h Instead of: - /usr/include/jconfig.h Signed-off-by: Thomas Debesse <dev@illwieckz.net>
1 parent 78eff53 commit dd08cd8

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

src/cmake/modules/FindJPEGTurbo.cmake

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,22 @@ endif ()
2929
if (JPEG_INCLUDE_DIR AND JPEG_LIBRARY)
3030
set (JPEG_INCLUDE_DIRS ${JPEG_INCLUDE_DIR} CACHE PATH "JPEG include dirs")
3131
set (JPEG_LIBRARIES ${JPEG_LIBRARY} CACHE STRING "JPEG libraries")
32-
file(STRINGS "${JPEG_INCLUDE_DIR}/jconfig.h"
32+
33+
find_path(jconfig_header_file jconfig.h PATHS "${JPEG_INCLUDE_DIR}")
34+
35+
if (NOT jconfig_header_file)
36+
file(GLOB_RECURSE jconfig_header_file_list "${JPEG_INCLUDE_DIR}/*/jconfig.h")
37+
38+
if (jconfig_header_file_list)
39+
list(GET jconfig_header_file_list 0 jconfig_header_file)
40+
endif()
41+
42+
if (NOT jconfig_header_file)
43+
message(WARNING "Cannot find jconfig.h from libturbojpeg")
44+
endif()
45+
endif()
46+
47+
file(STRINGS "${jconfig_header_file}"
3348
jpeg_lib_version REGEX "^#define[\t ]+JPEG_LIB_VERSION[\t ]+.*")
3449
if (jpeg_lib_version)
3550
string(REGEX REPLACE "^#define[\t ]+JPEG_LIB_VERSION[\t ]+([0-9]+).*"

0 commit comments

Comments
 (0)