Merge TactilityHeadless into Tactility (#263)

There currently is no practical use to have TactilityHeadless as a subproject. I'm merging it with the Tactility project.
This commit is contained in:
Ken Van Hoeylandt
2025-03-30 10:54:36 +02:00
committed by GitHub
parent d0ca3b16f8
commit d72852a6e2
114 changed files with 30 additions and 105 deletions
+2 -2
View File
@@ -4,8 +4,8 @@ set(DOCTESTINC ${PROJECT_SOURCE_DIR}/Include)
enable_testing()
add_subdirectory(TactilityCore)
add_subdirectory(TactilityHeadless)
add_subdirectory(Tactility)
add_custom_target(build-tests)
add_dependencies(build-tests TactilityCoreTests)
add_dependencies(build-tests TactilityHeadlessTests)
add_dependencies(build-tests TactilityTests)
@@ -5,23 +5,23 @@ enable_language(C CXX ASM)
set(CMAKE_CXX_COMPILER g++)
file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/*.cpp)
add_executable(TactilityHeadlessTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
add_executable(TactilityTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
add_definitions(-D_Nullable=)
add_definitions(-D_Nonnull=)
target_include_directories(TactilityHeadlessTests PRIVATE
target_include_directories(TactilityTests PRIVATE
${DOCTESTINC}
)
add_test(NAME TactilityHeadlessTests
COMMAND TactilityHeadlessTests
add_test(NAME TactilityTests
COMMAND TactilityTests
)
target_link_libraries(TactilityHeadlessTests PRIVATE
target_link_libraries(TactilityTests PRIVATE
Tactility
TactilityCore
TactilityHeadless
Tactility
Simulator
SDL2::SDL2-static SDL2-static
)