From a2ddfcf80b62fb8ec841648e689960c52970a917 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 19 Apr 2022 18:52:06 +0200 Subject: [PATCH] CMake: Fix warning when copying inplace config Quote all parameters to ensure paths are handled properly. --- build/cmake/config.cmake | 4 ++-- build/cmake/lib/webview/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake index 52ae69d3f6..b359560bc0 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake @@ -75,8 +75,8 @@ function(wx_write_config_inplace) endif() execute_process( COMMAND - ${CMAKE_COMMAND} -E ${COPY_CMD} - "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" + "${CMAKE_COMMAND}" -E ${COPY_CMD} + "${CMAKE_CURRENT_BINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" "${CMAKE_CURRENT_BINARY_DIR}/wx-config" ) endfunction() diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt index 0408ee7741..d42f6649d2 100644 --- a/build/cmake/lib/webview/CMakeLists.txt +++ b/build/cmake/lib/webview/CMakeLists.txt @@ -71,8 +71,8 @@ elseif(WXMSW) EXPECTED_HASH SHA256=${WEBVIEW2_SHA256}) file(MAKE_DIRECTORY ${WEBVIEW2_PACKAGE_DIR}) execute_process(COMMAND - ${CMAKE_COMMAND} -E tar x ${CMAKE_BINARY_DIR}/webview2.nuget - WORKING_DIRECTORY ${WEBVIEW2_PACKAGE_DIR} + "${CMAKE_COMMAND}" -E tar x "${CMAKE_BINARY_DIR}/webview2.nuget" + WORKING_DIRECTORY "${WEBVIEW2_PACKAGE_DIR}" ) endif() set(WEBVIEW2_PACKAGE_DIR ${WEBVIEW2_PACKAGE_DIR} CACHE INTERNAL "" FORCE)