Fix CI crash
This commit is contained in:
@@ -70,6 +70,13 @@ function(olive_add_test GROUP NAME SOURCE)
|
||||
else()
|
||||
add_test(${NAME} ${NAME})
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
# Windows has no RPATH: ffmpeg_bridge.dll must sit next to the executable
|
||||
add_custom_command(TARGET ${NAME} POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
$<TARGET_FILE:ffmpeg_bridge> $<TARGET_FILE_DIR:${NAME}>)
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
include(FetchContent)
|
||||
|
||||
@@ -128,3 +128,10 @@ if (MSVC)
|
||||
else()
|
||||
add_test(olive-gtest olive-gtest)
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
# Windows has no RPATH: ffmpeg_bridge.dll must sit next to the executable
|
||||
add_custom_command(TARGET olive-gtest POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
$<TARGET_FILE:ffmpeg_bridge> $<TARGET_FILE_DIR:olive-gtest>)
|
||||
endif()
|
||||
|
||||
@@ -207,8 +207,11 @@ protected:
|
||||
|
||||
void TearDown() override
|
||||
{
|
||||
// May be null when SetUp() skipped before creating the instance.
|
||||
if (RenderManager::instance()) {
|
||||
RenderManager::instance()->GetCacher()->SetProject(nullptr);
|
||||
RenderManager::DestroyInstance();
|
||||
}
|
||||
project_.reset();
|
||||
}
|
||||
|
||||
|
||||
@@ -188,8 +188,11 @@ protected:
|
||||
|
||||
void TearDown() override
|
||||
{
|
||||
// May be null when SetUp() skipped before creating the instance.
|
||||
if (RenderManager::instance()) {
|
||||
RenderManager::instance()->GetCacher()->SetProject(nullptr);
|
||||
RenderManager::DestroyInstance();
|
||||
}
|
||||
project_.reset();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user