AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Regenerate rest of configure.cmake files

Browse Source 
Change-Id: I17cca57c18f33d4283eb6009ba4c5ebb0c1847c3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2020-05-29 19:01:36 +02:00
parent e3361c1614
commit 71e3b04282
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.cmake
View File

@ -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)

12
src/network/configure.cmake
View File

@ -16,11 +16,11 @@ qt_config_compile_test(openssl_headers
"
#include <openssl/ssl.h>
#include <openssl/opensslv.h>
#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 <openssl/ssl.h>
#include <openssl/opensslv.h>
#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)
{