This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via df710b855b3990db579cfd904a55aa4ada275ae2 (commit) via caa9151169eb26076f3e276c0840e52116ce38b2 (commit) via 19d9f5908b541a3d61361cbfd1a315ac3f512543 (commit) from 1f0d0ae9dbe9cc589ed39b87bd28d9cbb2391325 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df710b855b3990db579cfd904a55aa4ada275ae2 commit df710b855b3990db579cfd904a55aa4ada275ae2 Merge: 1f0d0ae caa9151 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Fri Aug 24 12:02:40 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Aug 24 12:02:40 2012 -0400 Merge topic 'qt4-windows8' into next caa9151 Fix errors detecting Qt4 on Windows 8. 19d9f59 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=caa9151169eb26076f3e276c0840e52116ce38b2 commit caa9151169eb26076f3e276c0840e52116ce38b2 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Fri Aug 24 09:54:31 2012 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Fri Aug 24 09:54:31 2012 -0600 Fix errors detecting Qt4 on Windows 8. Thanks to Petr Baloun for the patch. 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) ----------------------------------------------------------------------- Summary of changes: Modules/FindQt4.cmake | 2 +- Source/CMakeVersion.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits