diff --git a/configure.cmake b/configure.cmake index 456999cf37b..b1ff2ba5b22 100644 --- a/configure.cmake +++ b/configure.cmake @@ -308,6 +308,25 @@ int main(int argc, char **argv) } ") +# intelcet +qt_config_compile_test(intelcet + LABEL "Support for Intel Control-flow Enforcement Technology" + CODE +" + + +int main(int argc, char **argv) +{ + (void)argc; (void)argv; + /* BEGIN TEST: */ +#if !defined(__CET__) +# error Intel CET not available +#endif + /* END TEST: */ + return 0; +} +") + #### Features @@ -812,6 +831,10 @@ qt_feature("relocatable" PRIVATE AUTODETECT QT_FEATURE_shared CONDITION QT_FEATURE_dlopen OR WIN32 OR NOT QT_FEATURE_shared ) +qt_feature("intelcet" PRIVATE + LABEL "Using Intel CET" + CONDITION TEST_intelcet +) qt_configure_add_summary_build_type_and_config() qt_configure_add_summary_section(NAME "Build options") qt_configure_add_summary_build_mode(Mode) diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 924ecb89da7..1dccd67f78f 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -16,11 +16,11 @@ qt_config_compile_test(openssl_headers " #include #include -#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L -# error OpenSSL >= 1.1.0 is required +#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10101000L +# error OpenSSL >= 1.1.1 is required #endif #if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES) -# error OpenSSL was reported as >= 1.1.0 but is missing required features, possibly it's libressl which is unsupported +# error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it's libressl which is unsupported #endif int main(int argc, char **argv) { @@ -41,11 +41,11 @@ qt_config_compile_test(openssl " #include #include -#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L -# error OpenSSL >= 1.1.0 is required +#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10101000L +# error OpenSSL >= 1.1.1 is required #endif #if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES) -# error OpenSSL was reported as >= 1.1.0 but is missing required features, possibly it's libressl which is unsupported +# error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it's libressl which is unsupported #endif int main(int argc, char **argv) {