Try pre-populating the CMAKE_COMMAND string

BRL-CAD · Dec 19, 2023 · b770656 · b770656
1 parent b5d3c54
commit b770656
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)