diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-01 23:12:43 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-05-01 23:12:43 -0700 |
| commit | 9c4099545b7ab0529f927050d8d61df99e68e315 (patch) | |
| tree | 1e918b52fe68e411a127402d9a632073afca8b16 /scripts | |
| parent | 20657a29ca8cc2aec104caca7703fcd72bf5746e (diff) | |
| download | vcpkg-9c4099545b7ab0529f927050d8d61df99e68e315.tar.gz vcpkg-9c4099545b7ab0529f927050d8d61df99e68e315.zip | |
[vcpkg-toolchain] When using the Vcpkg toolchain, do not also include the user-wide property sheet.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 5f4340a20..26fa020db 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -115,6 +115,7 @@ if(NOT VCPKG_TOOLCHAIN) -OutVariable out ) endif() + set_target_properties(${name} PROPERTIES VS_USER_PROPS do_not_import_user.props) set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false) endif() endfunction() @@ -125,6 +126,7 @@ if(NOT VCPKG_TOOLCHAIN) list(FIND ARGV "INTERFACE" INTERFACE_IDX) list(FIND ARGV "ALIAS" ALIAS_IDX) if(IMPORTED_IDX EQUAL -1 AND INTERFACE_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1) + set_target_properties(${name} PROPERTIES VS_USER_PROPS do_not_import_user.props) set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false) endif() endfunction() |