mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-20 13:22:22 -05:00
FindQt: Replace exec_program() with execute_process()
This commit is contained in:
@@ -91,7 +91,7 @@ endif ()
|
||||
# now find qmake
|
||||
find_program(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
|
||||
if(QT_QMAKE_EXECUTABLE_FINDQT)
|
||||
exec_program(${QT_QMAKE_EXECUTABLE_FINDQT} ARGS "-query QT_VERSION"
|
||||
execute_process(COMMAND ${QT_QMAKE_EXECUTABLE_FINDQT} -query QT_VERSION
|
||||
OUTPUT_VARIABLE QTVERSION)
|
||||
if(QTVERSION MATCHES "4")
|
||||
set(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt4 qmake program.")
|
||||
@@ -103,8 +103,8 @@ if(QT_QMAKE_EXECUTABLE_FINDQT)
|
||||
endif()
|
||||
|
||||
if(QT_QMAKE_EXECUTABLE_FINDQT)
|
||||
exec_program( ${QT_QMAKE_EXECUTABLE_FINDQT}
|
||||
ARGS "-query QT_INSTALL_HEADERS"
|
||||
execute_process(COMMAND ${QT_QMAKE_EXECUTABLE_FINDQT}
|
||||
-query QT_INSTALL_HEADERS
|
||||
OUTPUT_VARIABLE qt_headers )
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user