diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-30 15:54:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-30 15:54:21 (GMT) |
| commit | b69cf909b6eff7360942e0fbc3973cf2eaaf6a95 (patch) | |
| tree | 46aeb4fccc696d6815652cc61b4400c92f17cb52 /Modules | |
| parent | 907019b33861caef52c15ab9279ca3a40a6e8be3 (diff) | |
| parent | caa9151169eb26076f3e276c0840e52116ce38b2 (diff) | |
| download | CMake-b69cf909b6eff7360942e0fbc3973cf2eaaf6a95.zip CMake-b69cf909b6eff7360942e0fbc3973cf2eaaf6a95.tar.gz CMake-b69cf909b6eff7360942e0fbc3973cf2eaaf6a95.tar.bz2 | |
Merge topic 'qt4-windows8'
caa9151 Fix errors detecting Qt4 on Windows 8.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 2 |
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) |