[Cmake-commits] CMake branch, next, updated. v2.8.3-1402-gfab6253

[Clinton Stimpson]

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  fab6253d6fc67899d8409a8c9d61ca95e3ccc8d5 (commit)
       via  858fe0ed414a366df4b3d785fba5acc180fa4536 (commit)
      from  376f4dcdbb1b7a697f1b1b0b9f3b4e28502bf3ac (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=fab6253d6fc67899d8409a8c9d61ca95e3ccc8d5
commit fab6253d6fc67899d8409a8c9d61ca95e3ccc8d5
Merge: 376f4dc 858fe0e
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Jan 17 21:17:39 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 17 21:17:39 2011 -0500

    Merge topic 'qt4-query-exec-process' into next
    
    858fe0e Replace exec_program with execute_process for qmake queries.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=858fe0ed414a366df4b3d785fba5acc180fa4536
commit 858fe0ed414a366df4b3d785fba5acc180fa4536
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Jan 17 19:14:22 2011 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Jan 17 19:14:22 2011 -0700

    Replace exec_program with execute_process for qmake queries.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index d9d6ea7..79a3d51 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -447,7 +447,10 @@ MACRO (_QT4_ADJUST_LIB_VARS _camelCaseBasename)
 ENDMACRO (_QT4_ADJUST_LIB_VARS)
 
 function(_QT4_QUERY_QMAKE VAR RESULT)
-  exec_program(${QT_QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )
+  execute_process(COMMAND "${QT_QMAKE_EXECUTABLE}" -query ${VAR}
+    RESULT_VARIABLE return_code
+    OUTPUT_VARIABLE output ERROR_VARIABLE output
+    OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
   if(NOT return_code)
     file(TO_CMAKE_PATH "${output}" output)
     set(${RESULT} ${output} PARENT_SCOPE)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindQt4.cmake |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake