diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-30 15:51:03 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-07-02 00:11:12 +0200 |
| commit | a310319a0409c1faa1d2fc83c740e009f46dba84 (patch) | |
| tree | 54ef8be430406d556ca93edf843a18ec49a8b64f /util | |
| parent | af56a6f0cb61b45b13fe9efde12bc39b01030fc7 (diff) | |
CMake: Rewrite double-conversion find module
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 <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'util')
| -rw-r--r-- | util/cmake/helper.py | 3 |
1 files changed, 2 insertions, 1 deletions
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"), |