feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Botan: Fix compile if documentation tools are present

Browse Source 
Change-Id: If5adae5840cca75e3a1429922f48ea25b9903dc3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2018-08-13 09:38:27 +02:00
parent d8c81edfad
commit 13fbd1f867
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/botan/botan.pro
View File

@@ -22,7 +22,7 @@ BOTAN_MODULES = aes aes_ssse3 auto_rng bigint block cbc ctr des dh dsa ec_group
filters hmac mode_pad pubkey rsa sha1 sha1_sse2 sha1_x86 sha2_32 sha2_32_x86 \
sha2_64 simd system_rng,emsa_pkcs1,pbes2,pbkdf2
OTHER_FLAGS = --amalgamation --minimized-build --disable-shared \
--enable-modules=$$join(BOTAN_MODULES,",",,)
--enable-modules=$$join(BOTAN_MODULES,",",,) --without-documentation
mingw {
BOTAN_OS_SWITCH = "--os=mingw"
OTHER_FLAGS += --without-stack-protector

3
src/libs/botan/botan.qbs
View File

@@ -34,7 +34,8 @@ Product {
fileTags: "hpp"
}
prepare: {
var args = [input.filePath, "--amalgamation", "--minimized-build", "--disable-shared"];
var args = [input.filePath, "--amalgamation", "--minimized-build", "--disable-shared",
"--without-documentation"];
var modules = "aes,aes_ssse3,auto_rng,bigint,block,cbc,ctr,des,dh,dsa,ec_group,ecdh,"
+ "ecdsa,entropy,filters,hmac,mode_pad,pubkey,rsa,sha1,sha1_sse2,sha1_x86,"
+ "sha2_32,sha2_32_x86,sha2_64,simd,system_rng,emsa_pkcs1,pbes2,pbkdf2";