projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fd6a870)
When trying to run cmake, don't show stderr output.
authorJan Arve Saether <jan-arve.saether@digia.com>
Mon, 24 Sep 2012 10:01:53 +0000 (12:01 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 24 Sep 2012 16:01:14 +0000 (18:01 +0200)
It looks like the qmake process failed if cmake is not installed.

Change-Id: I721796a602d8c572144e9d21be5d62b737698b73
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
mkspecs/features/ctest_testcase.prf patch | blob | history

diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf
index 0ae5ba2..471b73e 100644 (file)
--- a/mkspecs/features/ctest_testcase.prf
+++ b/mkspecs/features/ctest_testcase.prf
@@ -1,5 +1,10 @@
 
-CMAKE_VERSION = $$system(cmake --version)
+win32 {
+    CMAKE_VERSION = $$system(cmake --version 2>NUL)
+} else {
+    CMAKE_VERSION = $$system(cmake --version 2>/dev/null)
+}
+
 
 check.commands =
 isEmpty(CMAKE_VERSION) {
Domain: UI Framework / Uncategorized;