diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-04-27 14:49:25 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-29 17:37:00 +0000 |
| commit | d1552232be84170bbce5e24dd78c8863342a51bb (patch) | |
| tree | 2d1e497d6e0e7c2a5353ed5ebf07d4b2c3d308e6 /tests | |
| parent | 526f1509b4e3aa70d93e1e0d728f68a148e6da6b (diff) | |
Fix error when configuring
The benchmark, manual folders is already added to the build in
Qt6BuildInternalsConfig (depending on whether QT_BUILD_BENCHMARKS
, QT_BUILD_MANUAL_TESTS are true). Adding it manually again leads to
errors like
The binary directory
C:/dev/qt/6.1/msvc-2019-amd64-toplevel/qt3d/tests/benchmarks
is already used to build a source directory. It cannot be used to build
source directory
C:/dev/qt/6.1/src/qt3d/tests/benchmarks
Specify a unique binary directory name.
This reverts part of 8448855b8050e56
Fixes: QTBUG-93240
Change-Id: Idc5b2fea6996cd8367f0963e993dd788dd3fb239
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit fd067783366eccedd57d0075677ca58a7e8c5294)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 606d0c03a..752d5ccc4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,9 +8,4 @@ endif() # many tests rely on extras to load data if(QT_FEATURE_qt3d_extras) qt_build_tests() - - add_subdirectory(manual) # add here since default seems to be to not build them - if(NOT QT_FEATURE_testcocoon AND CMAKE_BUILD_TYPE STREQUAL Release) - add_subdirectory(benchmarks) - endif() endif() |