From 71e0fcb806b83ac909df61a06fb64aea0f25b26a Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Mon, 19 Feb 2007 13:44:30 -0500
Subject: BUG: fix for bug 4464 handle qmake errors better

---
 Modules/FindQt4.cmake | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index c48915f..5b277d9 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -222,12 +222,18 @@ MACRO(QT_QUERY_QMAKE outvar invar)
     WORKING_DIRECTORY  
     ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake
     OUTPUT_VARIABLE _qmake_query_output
-    ERROR_VARIABLE _qmake_query_output )
-
+    RESULT_VARIABLE _qmake_result
+    ERROR_VARIABLE _qmake_error_output )
+  
   FILE(REMOVE_RECURSE 
     "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake")
 
-  STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}")
+  IF(_qmake_result)
+    MESSAGE(WARNING " querying qmake for ${invar}.  qmake reported:\n${_qmake_error_output}")
+  ELSE(_qmake_result)
+    STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}")
+  ENDIF(_qmake_result)
+
 ENDMACRO(QT_QUERY_QMAKE)
 
 # check for qmake
-- 
cgit v0.12