[libraries/qca/cmake-exec] cmake/modules: CMake: port away from long deprecated exec_program()
Rolf Eike Beer <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 68ea857e8160ccbae790600b6775c800b889b05e by Rolf Eike Beer.
Committed on 29/07/2026 at 09:18.
Pushed by dakon into branch 'cmake-exec'.
CMake: port away from long deprecated exec_program()
Fixes build with QCA_INSTALL_IN_QT_PREFIX=On and newer CMake versions.
M +8 -8 cmake/modules/QcaMacro.cmake
https://invent.kde.org/libraries/qca/-/commit/68ea857e8160ccbae790600b6775c800b889b05e
diff --git a/cmake/modules/QcaMacro.cmake b/cmake/modules/QcaMacro.cmake
index 94f2562d..ec9fa9c9 100644
--- a/cmake/modules/QcaMacro.cmake
+++ b/cmake/modules/QcaMacro.cmake
@@ -5,14 +5,14 @@ MACRO(SETUP_QT_DIRS)
else()
GET_TARGET_PROPERTY(QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} LOCATION)
endif()
- EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_LIBS" OUTPUT_VARIABLE QT_LIBRARY_DIR )
- EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PREFIX" OUTPUT_VARIABLE QT_PREFIX_DIR )
- EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" OUTPUT_VARIABLE QT_PLUGINS_DIR )
- EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_BINS" OUTPUT_VARIABLE QT_BINARY_DIR )
- EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE QT_HEADERS_DIR )
- EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_DOCS" OUTPUT_VARIABLE QT_DOC_DIR )
- EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_DATA" OUTPUT_VARIABLE QT_DATA_DIR )
- EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_HOST_DATA" OUTPUT_VARIABLE QT_ARCHDATA_DIR )
+ execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_LIBS OUTPUT_VARIABLE QT_LIBRARY_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_PREFIX OUTPUT_VARIABLE QT_PREFIX_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS OUTPUT_VARIABLE QT_PLUGINS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_BINS OUTPUT_VARIABLE QT_BINARY_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_HEADERS OUTPUT_VARIABLE QT_HEADERS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_DOCS OUTPUT_VARIABLE QT_DOC_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_DATA OUTPUT_VARIABLE QT_DATA_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_HOST_DATA OUTPUT_VARIABLE QT_ARCHDATA_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
SET( QT_MKSPECS_DIR "${QT_ARCHDATA_DIR}/mkspecs" )
ENDMACRO(SETUP_QT_DIRS)