From 96bb9dbaae68f4785854686718944d6163a64c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 15 Dec 2020 21:29:53 +0100 Subject: [PATCH] Test: prefix VersionTest with repo name to avoid conflicts. Would break due to a conflicting target name / executable in subproject setups that enable BUILD_TESTS. --- src/Magnum/Test/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Magnum/Test/CMakeLists.txt b/src/Magnum/Test/CMakeLists.txt index c618c8c84..96494817e 100644 --- a/src/Magnum/Test/CMakeLists.txt +++ b/src/Magnum/Test/CMakeLists.txt @@ -33,7 +33,11 @@ corrade_add_test(PixelStorageTest PixelStorageTest.cpp LIBRARIES Magnum) corrade_add_test(ResourceManagerTest ResourceManagerTest.cpp LIBRARIES Magnum) corrade_add_test(SamplerTest SamplerTest.cpp LIBRARIES MagnumTestLib) corrade_add_test(TagsTest TagsTest.cpp LIBRARIES Magnum) -corrade_add_test(VersionTest VersionTest.cpp LIBRARIES Magnum) + +# Prefixed with project name to avoid conflicts with VersionTest in Corrade and +# other repos +corrade_add_test(MagnumVersionTest VersionTest.cpp LIBRARIES Magnum) + corrade_add_test(VertexFormatTest VertexFormatTest.cpp LIBRARIES MagnumTestLib) set_target_properties( @@ -46,6 +50,7 @@ set_target_properties( ResourceManagerTest SamplerTest TagsTest + MagnumVersionTest VertexFormatTest PROPERTIES FOLDER "Magnum/Test")