From c58e47a183bfd777daaba54d54f5af940bee2f08 Mon Sep 17 00:00:00 2001
From: Benjamin Buch <[EMAIL REDACTED]>
Date: Thu, 25 May 2023 14:41:49 +0000
Subject: [PATCH] check if upstream lzma (xz) config was used and bind to it if
so
---
CMakeLists.txt | 2 +-
.../{FindLibLZMA.cmake => Findliblzma.cmake} | 28 +++++++++----------
cmake/LZMACodec.cmake | 3 +-
libtiff/CMakeLists.txt | 2 +-
4 files changed, 18 insertions(+), 17 deletions(-)
rename cmake/{FindLibLZMA.cmake => Findliblzma.cmake} (86%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 245fa069..8d440f31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,7 +217,7 @@ if(ZLIB_SUPPORT)
else()
message(STATUS " LERC support: Requested:${lerc} Availability:${LERC_FOUND} Support:${LERC_SUPPORT} (Depends on ZLIB Support)")
endif()
-message(STATUS " LZMA2 support: Requested:${lzma} Availability:${LIBLZMA_FOUND} Support:${LZMA_SUPPORT}")
+message(STATUS " LZMA2 support: Requested:${lzma} Availability:${liblzma_FOUND} Support:${LZMA_SUPPORT}")
message(STATUS " ZSTD support: Requested:${zstd} Availability:${ZSTD_USABLE} Support:${ZSTD_SUPPORT}")
message(STATUS " WEBP support: Requested:${webp} Availability:${WebP_FOUND} Support:${WEBP_SUPPORT}")
message(STATUS "")
diff --git a/cmake/FindLibLZMA.cmake b/cmake/Findliblzma.cmake
similarity index 86%
rename from cmake/FindLibLZMA.cmake
rename to cmake/Findliblzma.cmake
index 3042bac9..8dd5bc2e 100644
--- a/cmake/FindLibLZMA.cmake
+++ b/cmake/Findliblzma.cmake
@@ -2,7 +2,7 @@
# file Copyright.txt or https://cmake.org/licensing for details.
#[=======================================================================[.rst:
-FindLibLZMA
+Findliblzma
-----------
Find LZMA compression algorithm headers and library.
@@ -13,7 +13,7 @@ Imported Targets
.. versionadded:: 3.14
-This module defines :prop_tgt:`IMPORTED` target ``LibLZMA::LibLZMA``, if
+This module defines :prop_tgt:`IMPORTED` target ``liblzma::liblzma``, if
liblzma has been found.
Result variables
@@ -21,7 +21,7 @@ Result variables
This module will set the following variables in your project:
-``LIBLZMA_FOUND``
+``liblzma_FOUND``
True if liblzma headers and library were found.
``LIBLZMA_INCLUDE_DIRS``
Directory where liblzma headers are located.
@@ -70,7 +70,7 @@ endif()
if (LIBLZMA_LIBRARY)
include(CheckLibraryExists)
set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
- set(CMAKE_REQUIRED_QUIET ${LibLZMA_FIND_QUIETLY})
+ set(CMAKE_REQUIRED_QUIET ${liblzma_FIND_QUIETLY})
if(NOT LIBLZMA_LIBRARY_RELEASE AND NOT LIBLZMA_LIBRARY_DEBUG)
set(LIBLZMA_LIBRARY_check ${LIBLZMA_LIBRARY})
elseif(LIBLZMA_LIBRARY_RELEASE)
@@ -86,7 +86,7 @@ if (LIBLZMA_LIBRARY)
endif ()
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LibLZMA REQUIRED_VARS LIBLZMA_LIBRARY
+find_package_handle_standard_args(liblzma REQUIRED_VARS LIBLZMA_LIBRARY
LIBLZMA_INCLUDE_DIR
LIBLZMA_HAS_AUTO_DECODER
LIBLZMA_HAS_EASY_ENCODER
@@ -95,31 +95,31 @@ find_package_handle_standard_args(LibLZMA REQUIRED_VARS LIBLZMA_LIBRARY
)
mark_as_advanced( LIBLZMA_INCLUDE_DIR LIBLZMA_LIBRARY )
-if (LIBLZMA_FOUND)
+if (liblzma_FOUND)
set(LIBLZMA_LIBRARIES ${LIBLZMA_LIBRARY})
set(LIBLZMA_INCLUDE_DIRS ${LIBLZMA_INCLUDE_DIR})
- if(NOT TARGET LibLZMA::LibLZMA)
- add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED)
- set_target_properties(LibLZMA::LibLZMA PROPERTIES
+ if(NOT TARGET liblzma::liblzma)
+ add_library(liblzma::liblzma UNKNOWN IMPORTED)
+ set_target_properties(liblzma::liblzma PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${LIBLZMA_INCLUDE_DIR}
IMPORTED_LINK_INTERFACE_LANGUAGES C)
if(LIBLZMA_LIBRARY_RELEASE)
- set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY
+ set_property(TARGET liblzma::liblzma APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(LibLZMA::LibLZMA PROPERTIES
+ set_target_properties(liblzma::liblzma PROPERTIES
IMPORTED_LOCATION_RELEASE "${LIBLZMA_LIBRARY_RELEASE}")
endif()
if(LIBLZMA_LIBRARY_DEBUG)
- set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY
+ set_property(TARGET liblzma::liblzma APPEND PROPERTY
IMPORTED_CONFIGURATIONS DEBUG)
- set_target_properties(LibLZMA::LibLZMA PROPERTIES
+ set_target_properties(liblzma::liblzma PROPERTIES
IMPORTED_LOCATION_DEBUG "${LIBLZMA_LIBRARY_DEBUG}")
endif()
if(NOT LIBLZMA_LIBRARY_RELEASE AND NOT LIBLZMA_LIBRARY_DEBUG)
- set_target_properties(LibLZMA::LibLZMA PROPERTIES
+ set_target_properties(liblzma::liblzma PROPERTIES
IMPORTED_LOCATION "${LIBLZMA_LIBRARY}")
endif()
endif()
diff --git a/cmake/LZMACodec.cmake b/cmake/LZMACodec.cmake
index 7bafbdfc..c51afe82 100644
--- a/cmake/LZMACodec.cmake
+++ b/cmake/LZMACodec.cmake
@@ -26,7 +26,8 @@
# liblzma2
set(LZMA_SUPPORT FALSE)
-find_package(LibLZMA)
+find_package(liblzma)
+
option(lzma "use liblzma (required for LZMA2 compression)" ${LIBLZMA_FOUND})
if (lzma AND LIBLZMA_FOUND)
set(LZMA_SUPPORT TRUE)
diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
index cd90278b..636cf35c 100755
--- a/libtiff/CMakeLists.txt
+++ b/libtiff/CMakeLists.txt
@@ -149,7 +149,7 @@ if(LERC_SUPPORT)
endif()
endif()
if(LZMA_SUPPORT)
- target_link_libraries(tiff PRIVATE LibLZMA::LibLZMA)
+ target_link_libraries(tiff PRIVATE liblzma::liblzma)
string(APPEND tiff_requires_private " liblzma")
endif()
if(ZSTD_SUPPORT)