diff options
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/configure.cmake b/configure.cmake index 01ee4fa393..62af7f665f 100644 --- a/configure.cmake +++ b/configure.cmake @@ -113,7 +113,15 @@ SSL_free(SSL_new(0)); } ") -qt_find_package(WrapZSTD 1.3 PROVIDED_TARGETS WrapZSTD::WrapZSTD MODULE_NAME global QMAKE_LIB zstd) +qt_find_package(WrapZSTD 1.3 + PROVIDED_TARGETS + WrapZSTD::WrapZSTD + zstd::libzstd + zstd::libzstd_static + zstd::libzstd_shared + MODULE_NAME global + QMAKE_LIB zstd +) qt_find_package(WrapDBus1 1.2 PROVIDED_TARGETS dbus-1 MODULE_NAME global QMAKE_LIB dbus) qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev MODULE_NAME global QMAKE_LIB libudev) qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST MODULE_NAME core QMAKE_LIB lttng-ust) @@ -203,8 +211,16 @@ if(NOT QT_CONFIGURE_RUNNING) qt_evaluate_feature(use_gold_linker) qt_evaluate_feature(use_lld_linker) qt_evaluate_feature(use_mold_linker) + + qt_run_linker_version_script_support() endif() +qt_feature("version_tagging" + PUBLIC + AUTODETECT TRUE + CONDITION TEST_ld_version_script OR APPLE OR WIN32 +) +qt_feature_definition("version_tagging" "QT_NO_VERSION_TAGGING" NEGATE) #### Tests @@ -605,7 +621,7 @@ if(APPLE) endif() qt_feature("simulator_and_device" PUBLIC LABEL "Build for both simulator and device" - CONDITION UIKIT AND NOT QT_APPLE_SDK + CONDITION IOS AND NOT QT_APPLE_SDK ) qt_feature_config("simulator_and_device" QMAKE_PUBLIC_QT_CONFIG) qt_feature("rpath" PUBLIC @@ -626,7 +642,7 @@ qt_feature("force_asserts" PUBLIC ) qt_feature("framework" PUBLIC LABEL "Build Apple Frameworks" - AUTODETECT BUILD_SHARED_LIBS + AUTODETECT ON CONDITION APPLE ) qt_feature_definition("framework" "QT_MAC_FRAMEWORK_BUILD") @@ -1018,6 +1034,11 @@ qt_feature("qreal" ) qt_feature_definition("qreal" "QT_COORD_TYPE" VALUE "${QT_COORD_TYPE}") qt_feature_definition("qreal" "QT_COORD_TYPE_STRING" VALUE "\"${QT_COORD_TYPE}\"") +if(QT_COORD_TYPE STREQUAL "double") + qt_feature_definition("qreal" "QT_COORD_TYPE_IS_DOUBLE" VALUE "1") +elseif(QT_COORD_TYPE STREQUAL "float") + qt_feature_definition("qreal" "QT_COORD_TYPE_IS_FLOAT" VALUE "1") +endif() qt_feature("gui" PRIVATE LABEL "Qt Gui" ) |