midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4171 from zhaowenlan1779/remove-glad-hack

Browse Source 
Tests: Remove glad test OS X work-around
This commit is contained in:
Weiyi Wang 2018-09-01 15:30:06 +03:00 committed by GitHub
commit b4fdce0c2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/CMakeLists.txt
View File

@ -8,7 +8,6 @@ add_executable(tests
core/hle/kernel/hle_ipc.cpp core/hle/kernel/hle_ipc.cpp
core/memory/memory.cpp core/memory/memory.cpp
core/memory/vm_manager.cpp core/memory/vm_manager.cpp
glad.cpp
tests.cpp tests.cpp
) )
@ -22,7 +21,6 @@ endif()
create_target_directory_groups(tests) create_target_directory_groups(tests)
target_link_libraries(tests PRIVATE common core video_core) target_link_libraries(tests PRIVATE common core video_core)
target_link_libraries(tests PRIVATE glad) # To support linker work-around
target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include nihstro-headers Threads::Threads) target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include nihstro-headers Threads::Threads)
add_test(NAME tests COMMAND tests) add_test(NAME tests COMMAND tests)

14
src/tests/glad.cpp
View File

@ -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);
}