diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-07-30 23:19:41 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-07-30 23:19:41 +0300 |
| commit | 9ac33e56a16e933cc8a1c16e8c477f843d452f21 (patch) | |
| tree | 5b5febf49b4be5fac6d97f067dd92cf455d319f7 /source/creator | |
| parent | 091cc94379a2976176f0ae93721cfb2239a60e55 (diff) | |
| parent | fe47c7bf8435afee164896547067ee6092b4673a (diff) | |
Merge branch 'master' into soc-2019-openxr
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 7637f327617..dcf5682099e 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1056,6 +1056,12 @@ unset(LIB) setup_liblinks(blender) +# vcpkg substitutes our libs with theirs, which will cause issues when you +# you run these builds on other systems due to missing dlls. So we opt out +# the use of vcpkg +if (WIN32) + set_target_properties(blender PROPERTIES VS_GLOBAL_VcpkgEnabled "false") +endif() # ----------------------------------------------------------------------------- # Setup launcher |