diff options
| author | Davide Pesavento <davidepesa@gmail.com> | 2013-02-18 01:06:06 -0800 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-02-25 10:35:24 +0100 |
| commit | 34f083f1a40f847bb9cb010c7ee0b623b2579a3b (patch) | |
| tree | 07702580d48e6e46a4f3b12645e33d22a1d0ac9f /src/libs/3rdparty | |
| parent | 9cb7e7e4ad4b5c18855632b477f085aca31bb926 (diff) | |
| download | qt-creator-34f083f1a40f847bb9cb010c7ee0b623b2579a3b.tar.gz | |
Allow building against a system-wide installation of botan.
Task-number: QTCREATORBUG-8588
Change-Id: I429b7dc101b780a66b3e92c40eef3efef2328bf2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/libs/3rdparty')
| -rw-r--r-- | src/libs/3rdparty/botan/botan.h | 20 | ||||
| -rw-r--r-- | src/libs/3rdparty/botan/botan.pri | 8 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h index a073890986..6a9cbe0671 100644 --- a/src/libs/3rdparty/botan/botan.h +++ b/src/libs/3rdparty/botan/botan.h @@ -8,6 +8,22 @@ #ifndef BOTAN_AMALGAMATION_H__ #define BOTAN_AMALGAMATION_H__ +#ifdef USE_SYSTEM_BOTAN +#include <botan/auto_rng.h> +#include <botan/cbc.h> +#include <botan/der_enc.h> +#include <botan/dh.h> +#include <botan/dl_group.h> +#include <botan/dsa.h> +#include <botan/hmac.h> +#include <botan/init.h> +#include <botan/lookup.h> +#include <botan/pem.h> +#include <botan/pubkey.h> +#include <botan/rsa.h> +#include <botan/ui.h> +#else + #include <QtGlobal> #include <iosfwd> @@ -16184,5 +16200,5 @@ class BOTAN_DLL ANSI_X919_MAC : public MessageAuthenticationCode } - -#endif +#endif // USE_SYSTEM_BOTAN +#endif // BOTAN_AMALGAMATION_H__ diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri index ee2a167f1f..3c65676629 100644 --- a/src/libs/3rdparty/botan/botan.pri +++ b/src/libs/3rdparty/botan/botan.pri @@ -1,5 +1,12 @@ INCLUDEPATH *= $$PWD/.. HEADERS += $$PWD/botan.h + +equals(USE_SYSTEM_BOTAN, 1) { + DEFINES += USE_SYSTEM_BOTAN + CONFIG += link_pkgconfig + PKGCONFIG += botan-1.10 +} else { + SOURCES += $$PWD/botan.cpp CONFIG += exceptions @@ -46,3 +53,4 @@ unix:*-g++* { linux*|freebsd* { LIBS += -lrt } +} |