diff options
Diffstat (limited to 'util/cmake')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 3 | ||||
| -rw-r--r-- | util/cmake/helper.py | 2 | ||||
| -rwxr-xr-x | util/cmake/pro2cmake.py | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 0966a42932..6b68bf15bb 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -461,7 +461,6 @@ def parseInput(ctx, sinput, data, cm_fh): "widgets", "xplatform", "zlib", - "doubleconversion", "eventfd", "glib", "icu", @@ -772,7 +771,6 @@ def get_feature_mapping(): }, "debug": {"condition": "CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES"}, "dlopen": {"condition": "UNIX"}, - "doubleconversion": None, "enable_gdb_index": None, "enable_new_dtags": None, "force_debug_info": { @@ -838,7 +836,6 @@ def get_feature_mapping(): "enable": "TEST_sun_iconv", "disable": "NOT TEST_sun_iconv", }, - "system-doubleconversion": None, # No system libraries anymore! "system-sqlite": None, "system-xcb": None, "tiff": {"condition": "QT_FEATURE_imageformatplugin AND TIFF_FOUND"}, diff --git a/util/cmake/helper.py b/util/cmake/helper.py index bac0bdb725..aa6107412f 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -398,7 +398,7 @@ _library_map = [ LibraryMapping("directfb", "DirectFB", "PkgConfig::DirectFB"), LibraryMapping("db2", "DB2", "DB2::DB2"), LibraryMapping("dbus", "WrapDBus1", "dbus-1", resultVariable="DBus1"), - LibraryMapping("doubleconversion", None, None), + LibraryMapping("doubleconversion", "WrapDoubleConversion", "WrapDoubleConversion::WrapDoubleConversion"), LibraryMapping("drm", "Libdrm", "Libdrm::Libdrm"), LibraryMapping("egl", "EGL", "EGL::EGL"), LibraryMapping("flite", "Flite", "Flite::Flite"), diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 56d7e8d48d..bba01bb595 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1564,6 +1564,7 @@ def map_condition(condition: str) -> str: and is_known_3rd_party_library(feature_name[7:]) and not feature_name.startswith("system_jpeg") and not feature_name.startswith("system_zlib") + and not feature_name.startswith("system_doubleconversion") ): part = "ON" elif feature == "dlopen": |