mirror of https://git.tukaani.org/xz.git
CMake: Update liblzma-config.cmake generation.
Now that the threading is configurable, the liblzma CMake package only needs the threading library when using POSIX threads.
This commit is contained in:
parent
023907faa9
commit
32980d1562
|
@ -870,10 +870,7 @@ set_target_properties(liblzma PROPERTIES
|
||||||
PREFIX ""
|
PREFIX ""
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create liblzma-config-version.cmake. We use this spelling instead of
|
# Create liblzma-config-version.cmake.
|
||||||
# liblzmaConfig.cmake to make find_package work in case insensitive manner
|
|
||||||
# even with case sensitive file systems. This gives more consistent behavior
|
|
||||||
# between operating systems.
|
|
||||||
#
|
#
|
||||||
# FIXME: SameMajorVersion is correct for stable releases but it is wrong
|
# FIXME: SameMajorVersion is correct for stable releases but it is wrong
|
||||||
# for development releases where each release may have incompatible changes.
|
# for development releases where each release may have incompatible changes.
|
||||||
|
@ -883,13 +880,14 @@ write_basic_package_version_file(
|
||||||
VERSION "${liblzma_VERSION}"
|
VERSION "${liblzma_VERSION}"
|
||||||
COMPATIBILITY SameMajorVersion)
|
COMPATIBILITY SameMajorVersion)
|
||||||
|
|
||||||
# Create liblzma-config.cmake.
|
# Create liblzma-config.cmake. We use this spelling instead of
|
||||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/liblzma-config.cmake"
|
# liblzmaConfig.cmake to make find_package work in case insensitive
|
||||||
"include(CMakeFindDependencyMacro)
|
# manner even with case sensitive file systems. This gives more consistent
|
||||||
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
# behavior between operating systems. This optionally includes a dependency
|
||||||
find_dependency(Threads)
|
# on a threading library, so the contents are created in two separate parts.
|
||||||
|
# The "second half" is always needed, so create it first.
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/liblzma-targets.cmake\")
|
set(LZMA_CONFIG_CONTENTS
|
||||||
|
"include(\"\${CMAKE_CURRENT_LIST_DIR}/liblzma-targets.cmake\")
|
||||||
|
|
||||||
# Be compatible with the spelling used by the FindLibLZMA module. This
|
# Be compatible with the spelling used by the FindLibLZMA module. This
|
||||||
# doesn't use ALIAS because it would make CMake resolve LibLZMA::LibLZMA
|
# doesn't use ALIAS because it would make CMake resolve LibLZMA::LibLZMA
|
||||||
|
@ -900,6 +898,19 @@ set_target_properties(LibLZMA::LibLZMA PROPERTIES
|
||||||
INTERFACE_LINK_LIBRARIES liblzma::liblzma)
|
INTERFACE_LINK_LIBRARIES liblzma::liblzma)
|
||||||
")
|
")
|
||||||
|
|
||||||
|
if(ENABLE_THREADS STREQUAL "posix")
|
||||||
|
set(LZMA_CONFIG_CONTENTS
|
||||||
|
"include(CMakeFindDependencyMacro)
|
||||||
|
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
||||||
|
find_dependency(Threads)
|
||||||
|
|
||||||
|
${LZMA_CONFIG_CONTENTS}
|
||||||
|
")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/liblzma-config.cmake"
|
||||||
|
"${LZMA_CONFIG_CONTENTS}")
|
||||||
|
|
||||||
# Set CMAKE_INSTALL_LIBDIR and friends.
|
# Set CMAKE_INSTALL_LIBDIR and friends.
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue