mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2026-10-15 20:52:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix jxrlib detection with vanilla jxrlib

Browse Source 
Current cmake module assumes the headers are installed in $(INCLUDEDIR)/jxrlib, which is only true if using a custom CMakeLists (as provided by eg. Fedora)

Fix detection of jxrlib compiled with the upstream Makefile by checking the pc file first, and fallback to manual detection as before.
This commit is contained in:
Antonio Rojas
2026-10-12 10:10:26 +02:00
parent 5dafbe2d2f
commit b75a7616d3
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/find-modules/FindLibJXR.cmake
+16 -9
View File
@@ -6,19 +6,26 @@
# #
# Based on cmake code found at https://github.com/microsoft/vcpkg/blob/master/ports/jxrlib/FindJXR.cmake # Based on cmake code found at https://github.com/microsoft/vcpkg/blob/master/ports/jxrlib/FindJXR.cmake
find_path(LIBJXR_INCLUDE_DIRS find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
pkg_check_modules(LIBJXR QUIET libjxr)
endif()
if(NOT LIBJXR_FOUND)
find_path(LIBJXR_INCLUDE_DIRS
NAMES JXRGlue.h NAMES JXRGlue.h
PATH_SUFFIXES jxrlib PATH_SUFFIXES jxrlib libjxr/glue
) )
mark_as_advanced(LIBJXR_INCLUDE_DIRS) mark_as_advanced(LIBJXR_INCLUDE_DIRS)
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
find_library(LIBJPEGXR_LIBRARY NAMES jpegxr) find_library(LIBJPEGXR_LIBRARY NAMES jpegxr)
find_library(LIBJXRGLUE_LIBRARY NAMES jxrglue) find_library(LIBJXRGLUE_LIBRARY NAMES jxrglue)
set(LIBJXR_LIBRARIES ${LIBJPEGXR_LIBRARY} ${LIBJXRGLUE_LIBRARY}) set(LIBJXR_LIBRARIES ${LIBJPEGXR_LIBRARY} ${LIBJXRGLUE_LIBRARY})
mark_as_advanced(LIBJXR_LIBRARIES) mark_as_advanced(LIBJXR_LIBRARIES)
endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibJXR DEFAULT_MSG LIBJXR_INCLUDE_DIRS LIBJXR_LIBRARIES) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibJXR DEFAULT_MSG LIBJXR_INCLUDE_DIRS LIBJXR_LIBRARIES)