diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2016-12-02 11:56:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 11:56:22 -0800 |
| commit | f62072584299970964d600163cd0d065b5806221 (patch) | |
| tree | 2c7372d004ce26278ae9665e670cebe2565adc51 /scripts | |
| parent | 3b9e77a47712e5cd94f3a8edb90ee4f31c196ebb (diff) | |
| parent | f874d15ecabd7e7331e3da6bf03d7573fe48c6a4 (diff) | |
| download | vcpkg-f62072584299970964d600163cd0d065b5806221.tar.gz vcpkg-f62072584299970964d600163cd0d065b5806221.zip | |
Merge pull request #381 from barcharcraz/fix_alias
fixed vcpkg trying to set properties on INTERFACE and ALIAS targets
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 4 |
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() |