summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2017-02-13 09:52:07 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2017-03-10 14:16:19 +0000
commitf44fc5178bc417e93ec1b2e400dd6dea2d82982b (patch)
tree816c2349a3c79f24211e513498517030487b7c46
parent38d031cd33db6f3790024d92e72a6356e80fd53d (diff)
Make tests depend on host qdb
Otherwise parallel compilation may lead to errors with MSVC due to trying to compile shared files at the same time. The tests themselves share files, so built them one at a time with CONFIG=ordered. Change-Id: Iaf57b7786327da6d4b87bb7f4a0dc748818c7281 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--qdb.pro3
-rw-r--r--tests/tests.pro1
2 files changed, 4 insertions, 0 deletions
diff --git a/qdb.pro b/qdb.pro
index 519e42f..c63b7c1 100644
--- a/qdb.pro
+++ b/qdb.pro
@@ -10,6 +10,9 @@ sub_tests.depends += libqdb
SUBDIRS += qdb
qdb.depends += libqdb
+ # Tests share files with qdb and parallel compilation in that case may lead to error C1083
+ # with MSVC. Avoid that by building tests after the main project.
+ sub_tests.depends += qdb
}
unix {
diff --git a/tests/tests.pro b/tests/tests.pro
index 28b6fad..6962b5d 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,4 +1,5 @@
TEMPLATE = subdirs
+CONFIG += ordered
SUBDIRS = \
tst_qdbmessage.pro \