From 01a6e40377b1a3187ad5028c3150ed0a677229ea Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 2 Jul 2021 13:57:53 +0200 Subject: [PATCH] Unit test: Fix qbs build with internal gtest Change-Id: Ied99b436ae234e7be3944e71d0f6d13fc5f7b2f3 Reviewed-by: Christian Stenger --- tests/unit/unittest/unittest.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/unittest/unittest.qbs b/tests/unit/unittest/unittest.qbs index 436bb3080bf..8b36b89422b 100644 --- a/tests/unit/unittest/unittest.qbs +++ b/tests/unit/unittest/unittest.qbs @@ -11,7 +11,7 @@ Project { property bool useExternalLibs: preferExternalLibs && externalLibsPresent property bool useRepo: !useExternalLibs && hasRepo property bool preferExternalLibs: true - property bool externalLibsPresent: gtest.present && gmock.present + property bool externalLibsPresent: preferExternalLibs && gtest.present && gmock.present property string repoDir: FileInfo.joinPaths(path, "3rdparty", "googletest") property string gtestDir: FileInfo.joinPaths(repoDir, "googletest") property string gmockDir: FileInfo.joinPaths(repoDir, "googlemock")