diff --git a/src/Magnum/TextureTools/Test/CMakeLists.txt b/src/Magnum/TextureTools/Test/CMakeLists.txt index c38eeddb0..6823692e3 100644 --- a/src/Magnum/TextureTools/Test/CMakeLists.txt +++ b/src/Magnum/TextureTools/Test/CMakeLists.txt @@ -30,9 +30,9 @@ set(CMAKE_FOLDER "Magnum/TextureTools/Test") corrade_add_test(TextureToolsAtlasTest AtlasTest.cpp LIBRARIES MagnumTextureToolsTestLib) if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID) - set(DISTANCEFIELDGLTEST_FILES_DIR "DistanceFieldGLTestFiles") + set(TEXTURETOOLS_TEST_DIR .) else() - set(DISTANCEFIELDGLTEST_FILES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/DistanceFieldGLTestFiles) + set(TEXTURETOOLS_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) endif() if(MAGNUM_BUILD_GL_TESTS) diff --git a/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp b/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp index f9951b74b..767b1a755 100644 --- a/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp +++ b/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp @@ -120,7 +120,7 @@ DistanceFieldGLTest::DistanceFieldGLTest() { } else #endif { - _testDir = DISTANCEFIELDGLTEST_FILES_DIR; + _testDir = Utility::Path::join(TEXTURETOOLS_TEST_DIR, "DistanceFieldGLTestFiles"); } } diff --git a/src/Magnum/TextureTools/Test/configure.h.cmake b/src/Magnum/TextureTools/Test/configure.h.cmake index 35ea5e09e..a344b36eb 100644 --- a/src/Magnum/TextureTools/Test/configure.h.cmake +++ b/src/Magnum/TextureTools/Test/configure.h.cmake @@ -25,4 +25,4 @@ #cmakedefine ANYIMAGEIMPORTER_PLUGIN_FILENAME "${ANYIMAGEIMPORTER_PLUGIN_FILENAME}" #cmakedefine TGAIMPORTER_PLUGIN_FILENAME "${TGAIMPORTER_PLUGIN_FILENAME}" -#define DISTANCEFIELDGLTEST_FILES_DIR "${DISTANCEFIELDGLTEST_FILES_DIR}" +#define TEXTURETOOLS_TEST_DIR "${TEXTURETOOLS_TEST_DIR}"