diff options
| author | Lazydodo <github@lazydodo.com> | 2019-07-30 20:13:33 +0300 |
|---|---|---|
| committer | Lazydodo <github@lazydodo.com> | 2019-07-30 20:46:13 +0300 |
| commit | 34b3a9583ac2433dd8d223d2bd098adc30bc72bd (patch) | |
| tree | 1c843c2d9f20295253c46e9235f9ac17cd220f94 /source/creator | |
| parent | 9d7a03ab1177f7227653ec691e10ce328771a4eb (diff) | |
Cmake/windows: Fix vcpkg bypassing our libs folder.
Occasionally we get reports of people that build blender and end up
with either build errors or end up with builds that do not run on
other systems. The root cause is when you install vpckg and integrate
it into the build system it puts the search path for its includes and
libraries before anything else.
previously we told people to either uninstall vcpkg or remove the
conflicting packages, which was not great.
this change opts out of the use of vcpkg for blender only, so people
can keep using it for other work without issues.
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 77877ff3cca..e911a591881 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1050,6 +1050,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 |