From 7e7216f598889c04f5144be182a411c69d358d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= <eXpl0it3r@sfml-dev.org>
Date: Mon, 11 Feb 2019 22:32:04 +0100
Subject: [PATCH] Renamed test targets to test-sfml-module structure

---
 cmake/Macros.cmake     |  6 +-----
 test/CMakeLists.txt    | 10 +++++-----
 test/src/CatchMain.cpp |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
index f8e19f1f2..a966bc5b5 100644
--- a/cmake/Macros.cmake
+++ b/cmake/Macros.cmake
@@ -306,11 +306,8 @@ function(sfml_add_test target SOURCES DEPENDS)
     # set a source group for the source files
     source_group("" FILES ${SOURCES})
 
-    # check whether resources must be added in target
-    set(target_input ${SOURCES})
-
     # create the target
-    add_executable(${target} ${target_input})
+    add_executable(${target} ${SOURCES})
 
     # set the target's folder (for IDEs that support it, e.g. Visual Studio)
     set_target_properties(${target} PROPERTIES FOLDER "Tests")
@@ -462,4 +459,3 @@ function(sfml_export_targets)
             DESTINATION ${config_package_location}
             COMPONENT devel)
 endfunction()
-
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7bbcc1556..9e9f6111a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(SYSTEM_SRC
     "${SRCROOT}/TestUtilities/SystemUtil.hpp"
     "${SRCROOT}/TestUtilities/SystemUtil.cpp"
 )
-sfml_add_test(systemtest "${SYSTEM_SRC}"  sfml-system)
+sfml_add_test(test-sfml-system "${SYSTEM_SRC}"  sfml-system)
 
 if(SFML_BUILD_WINDOW)
     SET(WINDOW_SRC
@@ -20,7 +20,7 @@ if(SFML_BUILD_WINDOW)
         "${SRCROOT}/TestUtilities/WindowUtil.hpp"
         "${SRCROOT}/TestUtilities/WindowUtil.cpp"
     )
-    sfml_add_test(windowtest "${WINDOW_SRC}" sfml-window)
+    sfml_add_test(test-sfml-window "${WINDOW_SRC}" sfml-window)
 endif()
 
 if(SFML_BUILD_GRAPHICS)
@@ -30,15 +30,15 @@ if(SFML_BUILD_GRAPHICS)
         "${SRCROOT}/TestUtilities/GraphicsUtil.hpp"
         "${SRCROOT}/TestUtilities/GraphicsUtil.cpp"
     )
-    sfml_add_test(graphicstest "${GRAPHICS_SRC}" sfml-graphics)
+    sfml_add_test(test-sfml-graphics "${GRAPHICS_SRC}" sfml-graphics)
 endif()
 
 # Automatically run the tests at the end of the build
 add_custom_target(runtests ALL
-                  DEPENDS systemtest windowtest graphicstest
+                  DEPENDS test-sfml-system test-sfml-window test-sfml-graphics
 )
 
 add_custom_command(TARGET runtests
                    COMMENT "Run tests"
                    POST_BUILD COMMAND ctest ARGS --output-on-failure
-)
\ No newline at end of file
+)
diff --git a/test/src/CatchMain.cpp b/test/src/CatchMain.cpp
index fd9339d75..b3143fbb1 100644
--- a/test/src/CatchMain.cpp
+++ b/test/src/CatchMain.cpp
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
\ No newline at end of file
+#include <catch.hpp>