From 0567b28ba1d65e7c8c06ed8a2d431e889f24386a Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 18 Feb 2015 16:24:30 -0600 Subject: [PATCH] [Android] Fix building unit tests. --- Source/UnitTests/CMakeLists.txt | 3 +++ Source/UnitTests/VideoCommon/CMakeLists.txt | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt index 2ec996ce46..479d96c88e 100644 --- a/Source/UnitTests/CMakeLists.txt +++ b/Source/UnitTests/CMakeLists.txt @@ -2,6 +2,9 @@ set(LIBS core gtest) if(APPLE) list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY}) endif() +if(ANDROID) + set(LIBS ${LIBS} android log) +endif() macro(add_dolphin_test target srcs) # Since this is a Core dependency, it can't be linked as a library and has # to be linked as an object file. Otherwise CMake inserts the library after diff --git a/Source/UnitTests/VideoCommon/CMakeLists.txt b/Source/UnitTests/VideoCommon/CMakeLists.txt index 9c1b32b595..b5198536ed 100644 --- a/Source/UnitTests/VideoCommon/CMakeLists.txt +++ b/Source/UnitTests/VideoCommon/CMakeLists.txt @@ -1,4 +1 @@ -# This test currently doesn't link correctly when EGL is enabled due to issues with the GLInterface design -if(NOT USE_EGL) - add_dolphin_test(VertexLoaderTest VertexLoaderTest.cpp) -endif() +add_dolphin_test(VertexLoaderTest VertexLoaderTest.cpp)