diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-04-10 12:48:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-10 17:51:51 +0200 |
| commit | f29b7935087f0fcc31f29652e27a45e0b51f573d (patch) | |
| tree | c6e4a86baa0c546deaae4193e3648969da4d7347 /mkspecs/features | |
| parent | b5b6d6f5fc6918d328cc99a9a0e3d63c2ab23577 (diff) | |
Use CMake facility for verbose makefiles instead of an env var.
It should also have an effect for Visual Studio project files, not
just makefile generators.
Change-Id: I395071f09b29a6e8967a3d44e41d30480ae783f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/ctest_testcase.prf | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf index 7faf738d6e..9e24e1c6c2 100644 --- a/mkspecs/features/ctest_testcase.prf +++ b/mkspecs/features/ctest_testcase.prf @@ -53,9 +53,6 @@ isEmpty(CMAKE_VERSION) { dependentmodules -= $$CMAKE_QT_MODULES_UNDER_TEST dependentmodules = $$cmakeModuleList($$dependentmodules) - SET = set - equals(QMAKE_DIR_SEP, "/"):SET = export - CMAKE_MODULE_VERSIONS = CMAKE_MODULES_UNDER_TEST = for (MODULE_UNDER_TEST, CMAKE_QT_MODULES_UNDER_TEST) { @@ -69,8 +66,9 @@ isEmpty(CMAKE_VERSION) { CMAKE_MODULES_UNDER_TEST = $$join(CMAKE_MODULES_UNDER_TEST, ;) check.commands = \ - $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && $$SET VERBOSE=1 && \ + $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && \ cmake $$_PRO_FILE_PWD_ $$CMAKE_GENERATOR \ + -DCMAKE_VERBOSE_MAKEFILE=1 \ $$CMAKE_MODULE_DEFINES \ -DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} \ -DCMAKE_PREFIX_PATH=$$CMAKE_PREFIX_PATH \ |