3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 05:27:59 +08:00
Code Issues Projects Releases Wiki Activity

[CMake] VCPKG_APPLOCAL_DEPS sometimes causes conflicts when processing multiple files in the same directory (#13025)

Browse Source 
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This commit is contained in:
Sander Cox 2020-10-20 04:52:36 +02:00 committed by GitHub
parent 334aec69e4
commit e93810d2ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/buildsystems/vcpkg.cmake
View File

@ -394,6 +394,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE)
endif() endif()
option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON) option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON)
option(X_VCPKG_APPLOCAL_DEPS_SERIALIZED "(experimental) Add USES_TERMINAL to VCPKG_APPLOCAL_DEPS to force serialization." OFF)
function(add_executable name) function(add_executable name)
_add_executable(${ARGV}) _add_executable(${ARGV})
list(FIND ARGV "IMPORTED" IMPORTED_IDX) list(FIND ARGV "IMPORTED" IMPORTED_IDX)
@ -402,11 +403,16 @@ function(add_executable name)
if(IMPORTED_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1) if(IMPORTED_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1)
if(VCPKG_APPLOCAL_DEPS) if(VCPKG_APPLOCAL_DEPS)
if(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") if(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp")
set(EXTRA_OPTIONS "")
if(X_VCPKG_APPLOCAL_DEPS_SERIALIZED)
set(EXTRA_OPTIONS USES_TERMINAL)
endif()
add_custom_command(TARGET ${name} POST_BUILD add_custom_command(TARGET ${name} POST_BUILD
COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1 COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
-targetBinary $<TARGET_FILE:${name}> -targetBinary $<TARGET_FILE:${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
${EXTRA_OPTIONS}
) )
elseif(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") elseif(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx")
if (NOT MACOSX_BUNDLE_IDX EQUAL -1) if (NOT MACOSX_BUNDLE_IDX EQUAL -1)