diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-19 19:28:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-19 19:28:24 (GMT) |
| commit | b9f9c90eaf16ecaa555f2012c2b4d7a27daf2937 (patch) | |
| tree | d6bf2e3224fca434fae8b83075f5c77b655ca8d9 | |
| parent | ef1f9456aafb7c037601c5d6efb124f3f4152d46 (diff) | |
| parent | 858fe0ed414a366df4b3d785fba5acc180fa4536 (diff) | |
| download | CMake-b9f9c90eaf16ecaa555f2012c2b4d7a27daf2937.zip CMake-b9f9c90eaf16ecaa555f2012c2b4d7a27daf2937.tar.gz CMake-b9f9c90eaf16ecaa555f2012c2b4d7a27daf2937.tar.bz2 | |
Merge topic 'qt4-query-exec-process'
858fe0e Replace exec_program with execute_process for qmake queries.
| -rw-r--r-- | Modules/FindQt4.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
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) |