summaryrefslogtreecommitdiffstats
path: root/Modules/FindQt4.cmake
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2012-08-24 15:54:31 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2012-08-24 15:54:31 (GMT)
commitcaa9151169eb26076f3e276c0840e52116ce38b2 (patch)
tree59b30b24f8731f5315e5af39ef27be842e70b719 /Modules/FindQt4.cmake
parent19d9f5908b541a3d61361cbfd1a315ac3f512543 (diff)
downloadCMake-caa9151169eb26076f3e276c0840e52116ce38b2.zip
CMake-caa9151169eb26076f3e276c0840e52116ce38b2.tar.gz
CMake-caa9151169eb26076f3e276c0840e52116ce38b2.tar.bz2
Fix errors detecting Qt4 on Windows 8.
Thanks to Petr Baloun for the patch.
Diffstat (limited to 'Modules/FindQt4.cmake')
-rw-r--r--Modules/FindQt4.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index f133ae9..e1682a0 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -482,7 +482,7 @@ endmacro ()
function(_QT4_QUERY_QMAKE VAR RESULT)
execute_process(COMMAND "${QT_QMAKE_EXECUTABLE}" -query ${VAR}
RESULT_VARIABLE return_code
- OUTPUT_VARIABLE output ERROR_VARIABLE output
+ OUTPUT_VARIABLE output
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
if(NOT return_code)
file(TO_CMAKE_PATH "${output}" output)