3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg toolchain] Fix paths with special characters (#24463)

Browse Source 
* [vcpkg toolchain] Fix paths with special characters

* fix

* Use VERBATIM instead of double quotes
This commit is contained in:
Jack·Boos·Yu 2022-05-02 18:56:24 +00:00 committed by GitHub
parent c8a56fdc15
commit f30786c9c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/buildsystems/vcpkg.cmake
View File

@ -584,14 +584,16 @@ function(add_executable)
-targetBinary "$<TARGET_FILE:${target_name}>" -targetBinary "$<TARGET_FILE:${target_name}>"
-installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin" -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
-OutVariable out -OutVariable out
VERBATIM
${EXTRA_OPTIONS} ${EXTRA_OPTIONS}
) )
elseif(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") elseif(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx")
if(NOT MACOSX_BUNDLE_IDX EQUAL -1) if(NOT MACOSX_BUNDLE_IDX EQUAL -1)
add_custom_command(TARGET "${target_name}" POST_BUILD add_custom_command(TARGET "${target_name}" POST_BUILD
COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py"
"$<TARGET_FILE:${target_name}>" "$<TARGET_FILE:${target_name}>"
"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>"
VERBATIM
) )
endif() endif()
endif() endif()
@ -618,6 +620,7 @@ function(add_library)
-targetBinary "$<TARGET_FILE:${target_name}>" -targetBinary "$<TARGET_FILE:${target_name}>"
-installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin" -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
-OutVariable out -OutVariable out
VERBATIM
) )
endif() endif()
set_target_properties("${target_name}" PROPERTIES VS_USER_PROPS do_not_import_user.props) set_target_properties("${target_name}" PROPERTIES VS_USER_PROPS do_not_import_user.props)