From 3fe329db18a1a40f1415d250a9fe9f2ba761d2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 1 Apr 2018 00:05:13 +0200 Subject: [PATCH] MagnumFont: make the test actually work on Emscripten & Android. --- src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt | 12 +++++++++++- src/MagnumPlugins/MagnumFont/Test/configure.h.cmake | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt index 2c45b04db..8e63e76e7 100644 --- a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt @@ -23,9 +23,19 @@ # DEALINGS IN THE SOFTWARE. # +if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID) + set(MAGNUMFONT_TEST_DIR ".") +else() + set(MAGNUMFONT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -corrade_add_test(MagnumFontGLTest MagnumFontGLTest.cpp LIBRARIES MagnumMagnumFontTestLib MagnumOpenGLTester) +corrade_add_test(MagnumFontGLTest MagnumFontGLTest.cpp + LIBRARIES MagnumMagnumFontTestLib MagnumOpenGLTester + FILES + font.conf + font.tga) set_target_properties(MagnumFontGLTest PROPERTIES FOLDER "MagnumPlugins/MagnumFont/Test") target_include_directories(MagnumFontGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/MagnumPlugins/MagnumFont/Test/configure.h.cmake b/src/MagnumPlugins/MagnumFont/Test/configure.h.cmake index edb87375a..50671345e 100644 --- a/src/MagnumPlugins/MagnumFont/Test/configure.h.cmake +++ b/src/MagnumPlugins/MagnumFont/Test/configure.h.cmake @@ -23,4 +23,4 @@ DEALINGS IN THE SOFTWARE. */ -#define MAGNUMFONT_TEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}" +#define MAGNUMFONT_TEST_DIR "${MAGNUMFONT_TEST_DIR}"