From f8f1bc5be15aa521e8c13624454e75769adcd365 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:06:19 -0500 Subject: [PATCH] Quote CMAKE_COMMAND in case of spaces in paths --- qt/qt_build.cmake.in | 4 ++-- qt/qt_install.cmake.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt/qt_build.cmake.in b/qt/qt_build.cmake.in index ea72a13e..3fd215e8 100644 --- a/qt/qt_build.cmake.in +++ b/qt/qt_build.cmake.in @@ -13,9 +13,9 @@ else () endif ("${CMAKE_BUILD_TYPE}" STREQUAL "" OR "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") if (WIN32) - execute_process(COMMAND "@VCVARS_BAT@" && ${CMAKE_COMMAND} --build . ${QT_CMAKE_OPTS} RESULT_VARIABLE QT_RET WORKING_DIRECTORY @QT_BUILD_DIR@ OUTPUT_VARIABLE MSG ERROR_VARIABLE MSG) + execute_process(COMMAND "@VCVARS_BAT@" && "${CMAKE_COMMAND}" --build . ${QT_CMAKE_OPTS} RESULT_VARIABLE QT_RET WORKING_DIRECTORY @QT_BUILD_DIR@ OUTPUT_VARIABLE MSG ERROR_VARIABLE MSG) else (WIN32) - execute_process(COMMAND ${CMAKE_COMMAND} --build . ${QT_CMAKE_OPTS} RESULT_VARIABLE QT_RET WORKING_DIRECTORY @QT_BUILD_DIR@ OUTPUT_VARIABLE MSG ERROR_VARIABLE MSG) + execute_process(COMMAND "${CMAKE_COMMAND}" --build . ${QT_CMAKE_OPTS} RESULT_VARIABLE QT_RET WORKING_DIRECTORY @QT_BUILD_DIR@ OUTPUT_VARIABLE MSG ERROR_VARIABLE MSG) endif (WIN32) if (QT_RET) diff --git a/qt/qt_install.cmake.in b/qt/qt_install.cmake.in index 92f02e71..8d8d89b0 100644 --- a/qt/qt_install.cmake.in +++ b/qt/qt_install.cmake.in @@ -1,7 +1,7 @@ if (WIN32) - execute_process(COMMAND "@VCVARS_BAT@" && ${CMAKE_COMMAND} --install . RESULT_VARIABLE QT_RET WORKING_DIRECTORY @QT_BUILD_DIR@ OUTPUT_VARIABLE MSG ERROR_VARIABLE MSG) + execute_process(COMMAND "@VCVARS_BAT@" && "${CMAKE_COMMAND}" --install . RESULT_VARIABLE QT_RET WORKING_DIRECTORY @QT_BUILD_DIR@ OUTPUT_VARIABLE MSG ERROR_VARIABLE MSG) else (WIN32) - execute_process(COMMAND ${CMAKE_COMMAND} --install . RESULT_VARIABLE QT_RET WORKING_DIRECTORY @QT_BUILD_DIR@ OUTPUT_VARIABLE MSG ERROR_VARIABLE MSG) + execute_process(COMMAND "${CMAKE_COMMAND}" --install . RESULT_VARIABLE QT_RET WORKING_DIRECTORY @QT_BUILD_DIR@ OUTPUT_VARIABLE MSG ERROR_VARIABLE MSG) endif (WIN32) if (QT_RET)