From a310319a0409c1faa1d2fc83c740e009f46dba84 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 30 Jun 2022 15:51:03 +0200 Subject: CMake: Rewrite double-conversion find module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename FindWrapDoubleConversion.cmake into FindWrapSystemDoubleConversion.cmake. Merge contents of Finddouble-conversion.cmake into the one above. This allows users to provide their own Finddouble-conversion.cmake file (Conan can do it). Don't mark the system package as required, because we have a bundled one too. Add link to upstream. Make sure to show either Config file or library path when one is found. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104541 Change-Id: I9ea2330697c6fc280328849ca11522291c4073d8 Reviewed-by: Jörg Bornemann Reviewed-by: Alexey Edelev --- util/cmake/helper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util') diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 86033a734d..f40ea4d61f 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -365,7 +365,8 @@ _library_map = [ LibraryMapping("db2", "DB2", "DB2::DB2"), LibraryMapping("dbus", "WrapDBus1", "dbus-1", resultVariable="DBus1", extra=["1.2"]), LibraryMapping( - "doubleconversion", "WrapDoubleConversion", "WrapDoubleConversion::WrapDoubleConversion" + "doubleconversion", "WrapSystemDoubleConversion", + "WrapSystemDoubleConversion::WrapSystemDoubleConversion" ), LibraryMapping("dlt", "DLT", "DLT::DLT"), LibraryMapping("drm", "Libdrm", "Libdrm::Libdrm"), -- cgit v1.2.3