From 48561178e2488e6fe7763c2229d66072810afcb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Thu, 31 Mar 2022 12:41:13 +0200 Subject: zlib as static library Do build zlib as static 3rdparty library. This makes it easier to disable warnings. Pick-to: 6.3 Change-Id: I1db331b671b64e68d81c56b0df337983c3bbe7fa Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- cmake/FindWrapZLIB.cmake | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) (limited to 'cmake/FindWrapZLIB.cmake') diff --git a/cmake/FindWrapZLIB.cmake b/cmake/FindWrapZLIB.cmake index 585dc5e95e..ecb0070f81 100644 --- a/cmake/FindWrapZLIB.cmake +++ b/cmake/FindWrapZLIB.cmake @@ -1,29 +1,11 @@ -# We can't create the same interface imported target multiple times, CMake will complain if we do -# that. This can happen if the find_package call is done in multiple different subdirectories. -if(TARGET WrapZLIB::WrapZLIB) - set(WrapZLIB_FOUND ON) - return() -endif() - -set(WrapZLIB_FOUND OFF) - -find_package(ZLIB ${WrapZLIB_FIND_VERSION}) - -if(ZLIB_FOUND) - set(WrapZLIB_FOUND ON) - - add_library(WrapZLIB::WrapZLIB INTERFACE IMPORTED) - if(APPLE) - # On Darwin platforms FindZLIB sets IMPORTED_LOCATION to the absolute path of the library - # within the framework. This ends up as an absolute path link flag, which we don't want, - # because that makes our .prl files un-relocatable and also breaks iOS simulator_and_device - # SDK switching in Xcode. - # Just pass a linker flag instead. - target_link_libraries(WrapZLIB::WrapZLIB INTERFACE "-lz") - else() - target_link_libraries(WrapZLIB::WrapZLIB INTERFACE ZLIB::ZLIB) - endif() -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(WrapZLIB DEFAULT_MSG WrapZLIB_FOUND) +include(QtFindWrapHelper NO_POLICY_SCOPE) + +qt_find_package_system_or_bundled(wrap_zlib + FRIENDLY_PACKAGE_NAME "ZLIB" + WRAP_PACKAGE_TARGET "WrapZLIB::WrapZLIB" + WRAP_PACKAGE_FOUND_VAR_NAME "WrapZLIB_FOUND" + BUNDLED_PACKAGE_NAME "BundledZLIB" + BUNDLED_PACKAGE_TARGET "BundledZLIB" + SYSTEM_PACKAGE_NAME "WrapSystemZLIB" + SYSTEM_PACKAGE_TARGET "WrapSystemZLIB::WrapSystemZLIB" +) -- cgit v1.2.3