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/Modules/GTestTesting.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/Modules/GTestTesting.cmake')
| -rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index 2a05b92ba3f..30b10ae5980 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -34,8 +34,10 @@ macro(BLENDER_SRC_GTEST_EX) ${CMAKE_SOURCE_DIR}/extern/gmock/include ) unset(_current_include_directories) - - add_executable(${TARGET_NAME} ${ARG_SRC}) + if(WIN32) + set(MANIFEST "${CMAKE_BINARY_DIR}/tests.exe.manifest") + endif() + add_executable(${TARGET_NAME} ${ARG_SRC} ${MANIFEST}) target_include_directories(${TARGET_NAME} PUBLIC "${TEST_INC}") target_include_directories(${TARGET_NAME} SYSTEM PUBLIC "${TEST_INC_SYS}") target_link_libraries(${TARGET_NAME} @@ -75,6 +77,9 @@ macro(BLENDER_SRC_GTEST_EX) # that we can't fix. set_tests_properties(${TARGET_NAME} PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0) endif() + if(WIN32) + unset(MANIFEST) + endif() unset(TEST_INC) unset(TEST_INC_SYS) unset(TARGET_NAME) |