diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2011-01-18 02:14:22 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2011-01-18 02:14:22 (GMT) |
| commit | 858fe0ed414a366df4b3d785fba5acc180fa4536 (patch) | |
| tree | 04c47dd3e975c9e715e521961d0d27f8a41dbe1d | |
| parent | 3a7230afe94ccec600100e2c7ea6106b4e078b08 (diff) | |
| download | CMake-858fe0ed414a366df4b3d785fba5acc180fa4536.zip CMake-858fe0ed414a366df4b3d785fba5acc180fa4536.tar.gz CMake-858fe0ed414a366df4b3d785fba5acc180fa4536.tar.bz2 | |
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) |