mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 12:10:41 +02:00
Merge pull request #1327 from FearlessTobi/port-4171
Port #4171 from Citra: "Tests: Remove glad test OS X work-around"
This commit is contained in:
commit
e7af0f69da
@ -4,14 +4,12 @@ add_executable(tests
|
|||||||
core/arm/arm_test_common.cpp
|
core/arm/arm_test_common.cpp
|
||||||
core/arm/arm_test_common.h
|
core/arm/arm_test_common.h
|
||||||
core/core_timing.cpp
|
core/core_timing.cpp
|
||||||
glad.cpp
|
|
||||||
tests.cpp
|
tests.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
create_target_directory_groups(tests)
|
create_target_directory_groups(tests)
|
||||||
|
|
||||||
target_link_libraries(tests PRIVATE common core)
|
target_link_libraries(tests PRIVATE common core)
|
||||||
target_link_libraries(tests PRIVATE glad) # To support linker work-around
|
|
||||||
target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include Threads::Threads)
|
target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include Threads::Threads)
|
||||||
|
|
||||||
add_test(NAME tests COMMAND tests)
|
add_test(NAME tests COMMAND tests)
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
// Copyright 2016 Citra Emulator Project
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#include <catch2/catch.hpp>
|
|
||||||
#include <glad/glad.h>
|
|
||||||
|
|
||||||
// This is not an actual test, but a work-around for issue #2183.
|
|
||||||
// If tests uses functions in core but doesn't explicitly use functions in glad, the linker of macOS
|
|
||||||
// will error about undefined references from video_core to glad. So we explicitly use a glad
|
|
||||||
// function here to shut up the linker.
|
|
||||||
TEST_CASE("glad fake test", "[dummy]") {
|
|
||||||
REQUIRE(&gladLoadGL != nullptr);
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user