diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-11-10 23:23:55 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-11-10 23:23:55 +0300 |
| commit | 86bdd2acc66c95c3698525ab3d5d6263cc1b825c (patch) | |
| tree | c829c04589775d6c4180041266703aa929445dbc | |
| parent | b980cd163a9d5d77eeffc2e353333e739fa9e719 (diff) | |
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
| -rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
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) |