From b7706569154db29a5fe3cbe0c4cab61a708382c6 Mon Sep 17 00:00:00 2001
From: Clifford Yapp <238416+starseeker@users.noreply.github.com>
Date: Tue, 19 Dec 2023 09:57:15 -0500
Subject: [PATCH] Try pre-populating the CMAKE_COMMAND string

---
 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 3fd215e8..e673da5e 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 8d8d89b0..e68c438f 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)