aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorCharlie Barto <bartoc@umich.edu>2016-12-02 12:24:14 -0500
committerCharlie Barto <bartoc@umich.edu>2016-12-02 12:24:14 -0500
commitf874d15ecabd7e7331e3da6bf03d7573fe48c6a4 (patch)
treed875d62f6a8d5b65c32bc07909c72c7be3729c00 /scripts
parent25b6ef7a9d4ad73ae6123be715a7904c101f31fc (diff)
downloadvcpkg-f874d15ecabd7e7331e3da6bf03d7573fe48c6a4.tar.gz
vcpkg-f874d15ecabd7e7331e3da6bf03d7573fe48c6a4.zip
fixed vcpkg trying to set properties on INTERFACE and ALIAS targets
Diffstat (limited to 'scripts')
-rw-r--r--scripts/buildsystems/vcpkg.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 44db05a22..089d28db8 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -83,7 +83,9 @@ if(NOT VCPKG_TOOLCHAIN)
function(add_library name)
_add_library(${ARGV})
list(FIND ARGV "IMPORTED" IMPORTED_IDX)
- if(IMPORTED_IDX EQUAL -1)
+ 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_GLOBAL_VcpkgEnabled false)
endif()
endfunction()