diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-03-08 21:07:39 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-03-10 11:47:51 +0000 |
| commit | bffd6b33826fd52fe992b57cc3959155ebb8c0df (patch) | |
| tree | 0ea0ff2c023a3fa807081e15ef226966003ed9dc /qbs | |
| parent | f112f83511d35d1ccfc0d29b4f989c1c5f95e2c3 (diff) | |
| download | qt-creator-bffd6b33826fd52fe992b57cc3959155ebb8c0df.tar.gz | |
qbs build: Fix gtest_gmock module
There was a module name appearing where it shouldn't have. This just
worked accidentally due to a bug in the qbs implementation.
Change-Id: I768b5cefd82f201138e6e07c72867ec8cb62dd2b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/qtc_gtest_gmock/qtc_gtest_gmock.qbs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qbs/modules/qtc_gtest_gmock/qtc_gtest_gmock.qbs b/qbs/modules/qtc_gtest_gmock/qtc_gtest_gmock.qbs index 5229db1440..02bbb8a302 100644 --- a/qbs/modules/qtc_gtest_gmock/qtc_gtest_gmock.qbs +++ b/qbs/modules/qtc_gtest_gmock/qtc_gtest_gmock.qbs @@ -49,15 +49,15 @@ Module { } Properties { - condition: qtc_gtest_gmock.useRepo + condition: useRepo cpp.includePaths: [ - FileInfo.joinPaths(qtc_gtest_gmock.gtestDir, "include"), - FileInfo.joinPaths(qtc_gtest_gmock.gmockDir, "include"), + FileInfo.joinPaths(gtestDir, "include"), + FileInfo.joinPaths(gmockDir, "include"), ] } validate: { - if (!qtc_gtest_gmock.externalLibsPresent && !gtestProbe.found) { + if (!externalLibsPresent && !gtestProbe.found) { console.warn("No GTest found."); throw new Error(); } |