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

[vcpkg-toolchain] When using the Vcpkg toolchain, do not also include the user-wide property sheet.

Browse Source
This commit is contained in:
Robert Schumacher 2017-05-01 23:12:43 -07:00
parent 20657a29ca
commit 9c4099545b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/buildsystems/vcpkg.cmake
View File

@ -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()