From 9c4099545b7ab0529f927050d8d61df99e68e315 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 1 May 2017 23:12:43 -0700 Subject: [vcpkg-toolchain] When using the Vcpkg toolchain, do not also include the user-wide property sheet. --- scripts/buildsystems/vcpkg.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') 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() -- cgit v1.2.3