diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-23 12:29:08 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-28 23:08:20 +0100 |
commit | 34a4fe01663c3d8b193e42c6609e75c431f8a897 (patch) | |
tree | 6c0c8cf06157fafecfe5270b34e7b5e69873e193 /cmake | |
parent | 0ada264dda533cd3be2699330a5c1e2dd27a0e6a (diff) |
CMake: Rename FindZSTD to FindWrapZSTD
And the target ZSTD::ZSTD to WrapZSTD::WrapZSTD.
This should allow building Qt with the
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON set.
Pick-to: 6.2 6.3
Fixes: QTBUG-100537
Change-Id: I748601e4ad6f518323bf1034d6fc1de582c815e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/FindWrapZSTD.cmake (renamed from cmake/FindZSTD.cmake) | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/cmake/FindZSTD.cmake b/cmake/FindWrapZSTD.cmake index 67124719d9..e619d78c86 100644 --- a/cmake/FindZSTD.cmake +++ b/cmake/FindWrapZSTD.cmake @@ -5,17 +5,17 @@ # Try to locate the Zstd library. # If found, this will define the following variables: # -# ``ZSTD_FOUND`` +# ``WrapZSTD_FOUND`` # True if the zstd library is available # ``ZSTD_INCLUDE_DIRS`` # The zstd include directories # ``ZSTD_LIBRARIES`` # The zstd libraries for linking # -# If ``ZSTD_FOUND`` is TRUE, it will also define the following +# If ``WrapZSTD_FOUND`` is TRUE, it will also define the following # imported target: # -# ``ZSTD::ZSTD`` +# ``WrapZSTD::WrapZSTD`` # The zstd library find_package(zstd CONFIG QUIET) @@ -23,15 +23,16 @@ find_package(zstd CONFIG QUIET) include(FindPackageHandleStandardArgs) if(TARGET zstd::libzstd_static OR TARGET zstd::libzstd_shared) - find_package_handle_standard_args(ZSTD REQUIRED_VARS zstd_VERSION VERSION_VAR zstd_VERSION) + find_package_handle_standard_args(WrapZSTD + REQUIRED_VARS zstd_VERSION VERSION_VAR zstd_VERSION) if(TARGET zstd::libzstd_static) set(zstdtargetsuffix "_static") else() set(zstdtargetsuffix "_shared") endif() - if(NOT TARGET ZSTD::ZSTD) - add_library(ZSTD::ZSTD INTERFACE IMPORTED) - set_target_properties(ZSTD::ZSTD PROPERTIES + if(NOT TARGET WrapZSTD::WrapZSTD) + add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED) + set_target_properties(WrapZSTD::WrapZSTD PROPERTIES INTERFACE_LINK_LIBRARIES "zstd::libzstd${zstdtargetsuffix}") endif() else() @@ -55,21 +56,22 @@ else() include(SelectLibraryConfigurations) select_library_configurations(ZSTD) - find_package_handle_standard_args(ZSTD REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS - VERSION_VAR PC_ZSTD_VERSION) + find_package_handle_standard_args(WrapZSTD + REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS + VERSION_VAR PC_ZSTD_VERSION) - if(ZSTD_FOUND AND NOT TARGET ZSTD::ZSTD) - add_library(ZSTD::ZSTD UNKNOWN IMPORTED) - set_target_properties(ZSTD::ZSTD PROPERTIES + if(WrapZSTD_FOUND AND NOT TARGET WrapZSTD::WrapZSTD) + add_library(WrapZSTD::WrapZSTD UNKNOWN IMPORTED) + set_target_properties(WrapZSTD::WrapZSTD PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZSTD_INCLUDE_DIRS}") - set_target_properties(ZSTD::ZSTD PROPERTIES + set_target_properties(WrapZSTD::WrapZSTD PROPERTIES IMPORTED_LOCATION "${ZSTD_LIBRARY}") if(ZSTD_LIBRARY_RELEASE) - set_target_properties(ZSTD::ZSTD PROPERTIES + set_target_properties(WrapZSTD::WrapZSTD PROPERTIES IMPORTED_LOCATION_RELEASE "${ZSTD_LIBRARY_RELEASE}") endif() if(ZSTD_LIBRARY_DEBUG) - set_target_properties(ZSTD::ZSTD PROPERTIES + set_target_properties(WrapZSTD::WrapZSTD PROPERTIES IMPORTED_LOCATION_DEBUG "${ZSTD_LIBRARY_DEBUG}") endif() endif() @@ -77,7 +79,7 @@ else() mark_as_advanced(ZSTD_INCLUDE_DIRS ZSTD_LIBRARIES ZSTD_LIBRARY_RELEASE ZSTD_LIBRARY_DEBUG) endif() include(FeatureSummary) -set_package_properties(ZSTD PROPERTIES +set_package_properties(WrapZSTD PROPERTIES URL "https://github.com/facebook/zstd" DESCRIPTION "ZSTD compression library") |