From 86bdd2acc66c95c3698525ab3d5d6263cc1b825c Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 10 Nov 2020 13:23:55 -0700 Subject: Windows: Fix build issue with VCPKG For blender we disable VCPKG to prevent it from picking up the wrong libraries from VCPKG rather than our lib folder some of the cycles tests needed this to link correctly. reported by @alef on chat --- build_files/cmake/Modules/GTestTesting.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files/cmake/Modules') diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index 2e45f253a9a..6406dd6aa28 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -97,6 +97,7 @@ macro(BLENDER_SRC_GTEST_EX) set_tests_properties(${TARGET_NAME} PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0) endif() if(WIN32) + set_target_properties(${TARGET_NAME} PROPERTIES VS_GLOBAL_VcpkgEnabled "false") unset(MANIFEST) endif() unset(TEST_INC) -- cgit v1.2.3