diff options
Diffstat (limited to 'src/corelib/configure.cmake')
| -rw-r--r-- | src/corelib/configure.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 4ab122afd0..aa7c6fc386 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -17,7 +17,9 @@ set_property(CACHE INPUT_libb2 PROPERTY STRINGS undefined no qt system) if((UNIX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(WrapBacktrace PROVIDED_TARGETS WrapBacktrace::WrapBacktrace MODULE_NAME core QMAKE_LIB backtrace) endif() -qt_find_package(WrapDoubleConversion PROVIDED_TARGETS WrapDoubleConversion::WrapDoubleConversion MODULE_NAME core QMAKE_LIB doubleconversion) +qt_find_package(WrapSystemDoubleConversion + PROVIDED_TARGETS WrapSystemDoubleConversion::WrapSystemDoubleConversion + MODULE_NAME core QMAKE_LIB doubleconversion) qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib) qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data MODULE_NAME core QMAKE_LIB icu) if(QT_FEATURE_dlopen) @@ -413,7 +415,7 @@ qt_config_compile_test(renameat2 #include <fcntl.h> #include <stdio.h> -int main(void) +int main(int, char **argv) { /* BEGIN TEST: */ renameat2(AT_FDCWD, argv[1], AT_FDCWD, argv[2], RENAME_NOREPLACE | RENAME_WHITEOUT); @@ -526,7 +528,7 @@ qt_feature("doubleconversion" PUBLIC PRIVATE qt_feature_definition("doubleconversion" "QT_NO_DOUBLECONVERSION" NEGATE VALUE "1") qt_feature("system-doubleconversion" PRIVATE LABEL " Using system DoubleConversion" - CONDITION QT_FEATURE_doubleconversion AND WrapDoubleConversion_FOUND + CONDITION QT_FEATURE_doubleconversion AND WrapSystemDoubleConversion_FOUND ENABLE INPUT_doubleconversion STREQUAL 'system' DISABLE INPUT_doubleconversion STREQUAL 'qt' ) |