mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-02-18 06:18:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed test targets to test-sfml-module structure

Browse Source
This commit is contained in:
Lukas Dürrenberger 2019-02-11 22:32:04 +01:00 committed by Lukas Dürrenberger
parent 1d768839e7
commit 7e7216f598
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Macros.cmake
View File

@ -306,11 +306,8 @@ function(sfml_add_test target SOURCES DEPENDS)
# set a source group for the source files # set a source group for the source files
source_group("" FILES ${SOURCES}) source_group("" FILES ${SOURCES})
# check whether resources must be added in target
set(target_input ${SOURCES})
# create the target # 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 the target's folder (for IDEs that support it, e.g. Visual Studio)
set_target_properties(${target} PROPERTIES FOLDER "Tests") set_target_properties(${target} PROPERTIES FOLDER "Tests")
@ -462,4 +459,3 @@ function(sfml_export_targets)
DESTINATION ${config_package_location} DESTINATION ${config_package_location}
COMPONENT devel) COMPONENT devel)
endfunction() endfunction()

10
test/CMakeLists.txt
View File

@ -12,7 +12,7 @@ SET(SYSTEM_SRC
"${SRCROOT}/TestUtilities/SystemUtil.hpp" "${SRCROOT}/TestUtilities/SystemUtil.hpp"
"${SRCROOT}/TestUtilities/SystemUtil.cpp" "${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) if(SFML_BUILD_WINDOW)
SET(WINDOW_SRC SET(WINDOW_SRC
@ -20,7 +20,7 @@ if(SFML_BUILD_WINDOW)
"${SRCROOT}/TestUtilities/WindowUtil.hpp" "${SRCROOT}/TestUtilities/WindowUtil.hpp"
"${SRCROOT}/TestUtilities/WindowUtil.cpp" "${SRCROOT}/TestUtilities/WindowUtil.cpp"
) )
sfml_add_test(windowtest "${WINDOW_SRC}" sfml-window) sfml_add_test(test-sfml-window "${WINDOW_SRC}" sfml-window)
endif() endif()
if(SFML_BUILD_GRAPHICS) if(SFML_BUILD_GRAPHICS)
@ -30,15 +30,15 @@ if(SFML_BUILD_GRAPHICS)
"${SRCROOT}/TestUtilities/GraphicsUtil.hpp" "${SRCROOT}/TestUtilities/GraphicsUtil.hpp"
"${SRCROOT}/TestUtilities/GraphicsUtil.cpp" "${SRCROOT}/TestUtilities/GraphicsUtil.cpp"
) )
sfml_add_test(graphicstest "${GRAPHICS_SRC}" sfml-graphics) sfml_add_test(test-sfml-graphics "${GRAPHICS_SRC}" sfml-graphics)
endif() endif()
# Automatically run the tests at the end of the build # Automatically run the tests at the end of the build
add_custom_target(runtests ALL add_custom_target(runtests ALL
DEPENDS systemtest windowtest graphicstest DEPENDS test-sfml-system test-sfml-window test-sfml-graphics
) )
add_custom_command(TARGET runtests add_custom_command(TARGET runtests
COMMENT "Run tests" COMMENT "Run tests"
POST_BUILD COMMAND ctest ARGS --output-on-failure POST_BUILD COMMAND ctest ARGS --output-on-failure
) )

2
test/src/CatchMain.cpp
View File

@ -1,2 +1,2 @@
#define CATCH_CONFIG_MAIN #define CATCH_CONFIG_MAIN
#include <catch.hpp> #include <catch.hpp>