diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2017-04-26 01:26:57 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-04-28 09:34:14 +0000 |
| commit | 9b35914190bc06d37f6e337bd01ff5b62b0881be (patch) | |
| tree | 05b576461a5821582b4674abecd86bd992e66e23 /application-manager.pro | |
| parent | 010c944767cc28feebfc4e59518675ea863057f5 (diff) | |
| download | qtapplicationmanager-9b35914190bc06d37f6e337bd01ff5b62b0881be.tar.gz | |
Get rid of the OpenSSL headers build dependency
This also makes it a lot easier to build against newer Android NDKs, where
the OpenSSL libs are not available anymore. libcrypto still needs to be
deployed, but at least the build-time dependency is removed.
Change-Id: I966e2561708aaa7b5ae2f97dc2dc41b179881009
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'application-manager.pro')
| -rw-r--r-- | application-manager.pro | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/application-manager.pro b/application-manager.pro index b3b710bf..4e78221a 100644 --- a/application-manager.pro +++ b/application-manager.pro @@ -14,8 +14,6 @@ load(configure) qtCompileTest(libarchive) qtCompileTest(libyaml) qtCompileTest(libdbus) -qtCompileTest(libcrypto) - qtHaveModule(compositor)|if(qtHaveModule(waylandcompositor):qtHaveModule(waylandcompositor-private)) { CONFIG += am_compatible_compositor @@ -25,9 +23,8 @@ force-single-process:force-multi-process:error("You cannot both specify force-si force-multi-process:!headless:!am_compatible_compositor:error("You forced multi-process mode, but the QtCompositor module is not available") force-multi-process:!config_libdbus:error("You forced multi-process mode, but libdbus-1 (>= 1.6) is not available") -if(linux:!android|force-libcrypto) { - !config_libcrypto:error("Could not find a suitable libcrypto (needs OpenSSL >= 1.0.1 and < 1.1.0)") - !if(contains(QT_CONFIG,"openssl")|contains(QT_CONFIG,"openssl-linked")):error("Found libcrypto (OpenSSL), but Qt was built without OpenSSL support.") +if(linux|force-libcrypto) { + !if(contains(QT_CONFIG,"openssl")|contains(QT_CONFIG,"openssl-linked")):error("Qt was built without OpenSSL support.") } MIN_MINOR=6 @@ -113,7 +110,6 @@ OTHER_FILES += \ header.*[^~] \ LICENSE.*[^~] \ config.tests/libarchive/* \ - config.tests/libcrypto/* \ config.tests/libdbus/* \ config.tests/libyaml/* \ |