Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix warning when copying inplace config

Browse Source 
Quote all parameters to ensure paths are handled properly.
This commit is contained in:
Maarten Bent
2022-04-19 18:52:06 +02:00
parent 24e20d80e3
commit a2ddfcf80b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/config.cmake
View File

@@ -75,8 +75,8 @@ function(wx_write_config_inplace)
endif() endif()
execute_process( execute_process(
COMMAND COMMAND
${CMAKE_COMMAND} -E ${COPY_CMD} "${CMAKE_COMMAND}" -E ${COPY_CMD}
"lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" "${CMAKE_CURRENT_BINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
"${CMAKE_CURRENT_BINARY_DIR}/wx-config" "${CMAKE_CURRENT_BINARY_DIR}/wx-config"
) )
endfunction() endfunction()

4
build/cmake/lib/webview/CMakeLists.txt
View File

@@ -71,8 +71,8 @@ elseif(WXMSW)
EXPECTED_HASH SHA256=${WEBVIEW2_SHA256}) EXPECTED_HASH SHA256=${WEBVIEW2_SHA256})
file(MAKE_DIRECTORY ${WEBVIEW2_PACKAGE_DIR}) file(MAKE_DIRECTORY ${WEBVIEW2_PACKAGE_DIR})
execute_process(COMMAND execute_process(COMMAND
${CMAKE_COMMAND} -E tar x ${CMAKE_BINARY_DIR}/webview2.nuget "${CMAKE_COMMAND}" -E tar x "${CMAKE_BINARY_DIR}/webview2.nuget"
WORKING_DIRECTORY ${WEBVIEW2_PACKAGE_DIR} WORKING_DIRECTORY "${WEBVIEW2_PACKAGE_DIR}"
) )
endif() endif()
set(WEBVIEW2_PACKAGE_DIR ${WEBVIEW2_PACKAGE_DIR} CACHE INTERNAL "" FORCE) set(WEBVIEW2_PACKAGE_DIR ${WEBVIEW2_PACKAGE_DIR} CACHE INTERNAL "" FORCE)