diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2019-12-06 21:36:49 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2019-12-06 21:37:14 +0300 |
| commit | 5e96b860a372a87dd94131af75289160cc5911ee (patch) | |
| tree | ded57543e43bf98ac0810f6556846f914cfdd73f /build_files/cmake/platform/platform_win32_bundle_crt.cmake | |
| parent | dd4b98133eb861f28053e7464574254d3cd9e594 (diff) | |
Windows: Fix failing tests due to missing manifest.
Tests were missing a manifest, and were importing the
wrong version of Microsoft.Windows.Common-Controls
causing blenloader_test, bmesh_core_test and alembic_test
to fail due a loader error.
Diffstat (limited to 'build_files/cmake/platform/platform_win32_bundle_crt.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32_bundle_crt.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build_files/cmake/platform/platform_win32_bundle_crt.cmake b/build_files/cmake/platform/platform_win32_bundle_crt.cmake index a4aa608b013..e84a139fac9 100644 --- a/build_files/cmake/platform/platform_win32_bundle_crt.cmake +++ b/build_files/cmake/platform/platform_win32_bundle_crt.cmake @@ -1,3 +1,6 @@ +# First generate the manifest for tests since it will not need the dependency on the CRT. +configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/tests.exe.manifest @ONLY) + if(WITH_WINDOWS_BUNDLE_CRT) set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) |