From 34b3a9583ac2433dd8d223d2bd098adc30bc72bd Mon Sep 17 00:00:00 2001 From: Lazydodo Date: Tue, 30 Jul 2019 11:13:33 -0600 Subject: 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. --- source/creator/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/creator') 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 -- cgit v1.2.3