mirror of
https://github.com/mumble-voip/mumble.git
synced 2025-10-26 11:19:16 +00:00
tests: depend on OpenSSL in test.pri instead of each individual test.
The murmur_pch.h file which most tests use -- either directly, or indrectly -- depends on being able to include OpenSSL headers. Some of our tests did not include(qmake/openssl.pri), which meant that those tests would fail to build in CONFIG(no-pch), such as on macOS. This commit works around that issue by depending on OpenSSL for all tests.
This commit is contained in:
parent
19ecc86f17
commit
57b3aa60fd
@ -4,7 +4,6 @@
|
||||
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
|
||||
|
||||
include(../test.pri)
|
||||
include(../../../qmake/openssl.pri)
|
||||
|
||||
QT *= network
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
|
||||
|
||||
include(../test.pri)
|
||||
include(../../../qmake/openssl.pri)
|
||||
|
||||
TARGET = TestCryptographicHash
|
||||
SOURCES = TestCryptographicHash.cpp CryptographicHash.cpp
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
|
||||
|
||||
include(../test.pri)
|
||||
include(../../../qmake/openssl.pri)
|
||||
|
||||
TARGET = TestCryptographicRandom
|
||||
SOURCES = TestCryptographicRandom.cpp CryptographicRandom.cpp arc4random_uniform.cpp
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
|
||||
|
||||
include(../test.pri)
|
||||
include(../../../qmake/openssl.pri)
|
||||
|
||||
TARGET = TestPasswordGenerator
|
||||
SOURCES = TestPasswordGenerator.cpp PasswordGenerator.cpp CryptographicRandom.cpp arc4random_uniform.cpp
|
||||
|
||||
@ -26,3 +26,9 @@ LANGUAGE = C++
|
||||
|
||||
VPATH *= ../..
|
||||
INCLUDEPATH *= ../.. ../../murmur ../../mumble
|
||||
|
||||
# We have to depend on OpenSSL in all tests
|
||||
# for no-pch builds to work. Our PCH headers
|
||||
# include OpenSSL, and if the headers aren't
|
||||
# in the include path, the build will break.
|
||||
include(../../qmake/openssl.pri)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user