From f30786c9c4c901f21a13e2d524349e39cc359a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 2 May 2022 18:56:24 +0000 Subject: [PATCH] [vcpkg toolchain] Fix paths with special characters (#24463) * [vcpkg toolchain] Fix paths with special characters * fix * Use VERBATIM instead of double quotes --- scripts/buildsystems/vcpkg.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index ce3a9bbe1d..0ae8473ffd 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -584,14 +584,16 @@ function(add_executable) -targetBinary "$" -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin" -OutVariable out + VERBATIM ${EXTRA_OPTIONS} ) elseif(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") if(NOT MACOSX_BUNDLE_IDX EQUAL -1) add_custom_command(TARGET "${target_name}" POST_BUILD - COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" - "$" - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>" + COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" + "$" + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>" + VERBATIM ) endif() endif() @@ -618,6 +620,7 @@ function(add_library) -targetBinary "$" -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin" -OutVariable out + VERBATIM ) endif() set_target_properties("${target_name}" PROPERTIES VS_USER_PROPS do_not_import_user.props)