diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-03-06 09:20:41 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-03-06 12:32:58 +0100 |
| commit | b4f19e427775311c769f3a29864f9ad72ee2d791 (patch) | |
| tree | a69a89ff8dfe1a2269d3679955259a8e9fd2cbd8 /src/CMakeLists.txt | |
| parent | 8ffb9053ad300b1fc00b2dd4e808c99d03a3d7a4 (diff) | |
CMake: Remove special case handling for OpenSSL
Now that we can generate the library config tests which verify the
OpenSSL version, we no longer need these special cases.
Change-Id: I8ddccf4ae1c698db9fac391976b3b4b670712582
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 00c2f05b29..4b1c28de25 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,16 +1,5 @@ # special case skip regeneration -# Temporary fix for OpenSSL feature detection until we can provide a -# proper implementation of additional compile tests for library dependencies -# in configure.json - -find_package(OpenSSL) -if (NOT OPENSSL_FOUND OR NOT OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0") - set(QT_FEATURE_openssl_runtime OFF CACHE BOOL "" FORCE) - set(QT_FEATURE_openssl_linked OFF CACHE BOOL "" FORCE) - set(QT_FEATURE_openssl OFF CACHE BOOL "" FORCE) -endif() - # We need to include the features of a few modules before they are actually declared. # The feature values are used as conditions for deciding whether bundled 3rd party libraries # should be built. |