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 | |
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>
-rw-r--r-- | cmake/FindWrapZSTD.cmake (renamed from cmake/FindZSTD.cmake) | 34 | ||||
-rw-r--r-- | configure.cmake | 4 | ||||
-rw-r--r-- | src/corelib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/network/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/tools/rcc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | util/cmake/helper.py | 2 |
6 files changed, 24 insertions, 22 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") diff --git a/configure.cmake b/configure.cmake index a24277806b..d5a5cfbdc3 100644 --- a/configure.cmake +++ b/configure.cmake @@ -17,7 +17,7 @@ if(TARGET ZLIB::ZLIB) endif() # special case end -qt_find_package(ZSTD 1.3 PROVIDED_TARGETS ZSTD::ZSTD MODULE_NAME global QMAKE_LIB zstd) +qt_find_package(WrapZSTD 1.3 PROVIDED_TARGETS WrapZSTD::WrapZSTD MODULE_NAME global QMAKE_LIB zstd) qt_find_package(WrapDBus1 1.2 PROVIDED_TARGETS dbus-1 MODULE_NAME global QMAKE_LIB dbus) qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev MODULE_NAME global QMAKE_LIB libudev) @@ -883,7 +883,7 @@ qt_feature("system-zlib" PRIVATE ) qt_feature("zstd" PRIVATE LABEL "Zstandard support" - CONDITION ZSTD_FOUND + CONDITION WrapZSTD_FOUND ) qt_feature("stdlib-libcpp" PRIVATE LABEL "Using stdlib=libc++" diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 05ac6866d9..ffd22d6884 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -866,7 +866,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_datetimeparser qt_internal_extend_target(Core CONDITION QT_FEATURE_zstd LIBRARIES - ZSTD::ZSTD + WrapZSTD::WrapZSTD ) qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index af98faf5a9..9fc13f1a7e 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -134,7 +134,7 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_brotli AND QT_FEATURE_htt qt_internal_extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_zstd LIBRARIES - ZSTD::ZSTD + WrapZSTD::WrapZSTD ) qt_internal_extend_target(Network CONDITION QT_FEATURE_system_zlib diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt index efeadf803a..8a8a1fa18e 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -32,7 +32,7 @@ qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE DEFINES QT_FEATURE_zstd=1 LIBRARIES - ZSTD::ZSTD + WrapZSTD::WrapZSTD ) qt_internal_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 2524a3ef7f..e924e272bb 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -642,7 +642,7 @@ _library_map = [ LibraryMapping("xlib", "X11", "X11::X11"), LibraryMapping("xrender", "XRender", "PkgConfig::XRender", extra=["0.6"]), LibraryMapping("zlib", "WrapZLIB", "WrapZLIB::WrapZLIB", extra=["1.0.8"]), - LibraryMapping("zstd", "ZSTD", "ZSTD::ZSTD", extra=["1.3"]), + LibraryMapping("zstd", "WrapZSTD", "WrapZSTD::WrapZSTD", extra=["1.3"]), LibraryMapping("tiff", "TIFF", "TIFF::TIFF"), LibraryMapping("webp", "WrapWebP", "WrapWebP::WrapWebP"), LibraryMapping("jasper", "WrapJasper", "WrapJasper::WrapJasper"), |