Compare commits

..

No commits in common. "4f15a6f7d99a1da0defe7a1074b56d917c77ab2d" and "3a5d0bb9f47e24811dca258764f10d1d3667dc96" have entirely different histories.

12 changed files with 0 additions and 80 deletions

View file

@ -3,5 +3,3 @@ project(fishbowl)
add_subdirectory(engine)
add_subdirectory(client)
enable_testing()

View file

@ -1,43 +0,0 @@
{
"version": 10,
"cmakeMinimumRequired": {
"major": 3,
"minor": 11,
"patch": 0
},
"configurePresets": [
{
"name": "default",
"displayName": "Default",
"binaryDir": "build"
},
{
"name": "default-with-tests",
"displayName": "Default (with tests)",
"inherits": "default",
"cacheVariables": {
"FISHBONE_BUILD_TESTS": "ON",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
}
],
"buildPresets": [
{
"name": "default",
"configurePreset": "default"
},
{
"name": "default-with-tests",
"configurePreset": "default-with-tests"
}
],
"testPresets": [
{
"name": "default",
"configurePreset": "default-with-tests",
"output": {
"outputOnFailure": true
}
}
]
}

View file

@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 3.11)
project(fishbone)
option(FISHBONE_BUILD_TESTS "Compile tests for fishbone" OFF)
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake")
message(STATUS "Downloading CPM.cmake...")
file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@ -58,11 +56,3 @@ fb_add_dep(fishbone lz4)
# Networking
fb_add_dep(fishbone enet)
# Testing
if(FISHBONE_BUILD_TESTS)
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/deps/catch2.cmake")
list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/extras)
enable_testing()
add_subdirectory(tests)
endif()

View file

@ -1,7 +0,0 @@
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake")
CPMAddPackage(
NAME "catch2"
GITHUB_REPOSITORY "catchorg/Catch2"
GIT_TAG "v3.15.0"
)

View file

@ -28,9 +28,6 @@ namespace fishbone {
Mutex();
~Mutex();
Mutex(const Mutex&) = delete;
Mutex& operator=(const Mutex&) = delete;
void lock();
void unlock();
};

View file

@ -1,4 +1,3 @@
#include <cstring>
#include <fishbone/foundation.h>
struct fishbone::Sound::Impl {

View file

@ -1,4 +1,3 @@
#include <cstring>
#include <fishbone/foundation.h>
struct fishbone::Sound::Impl {

View file

@ -1,4 +1,3 @@
#include <cstring>
#include <fishbone/foundation.h>
struct fishbone::Sound::Impl {

View file

@ -1,4 +1,3 @@
#include <cstring>
#include <fishbone/foundation.h>
struct fishbone::Sound::Impl {

View file

@ -1,4 +1,3 @@
#include <cstring>
#include <fishbone/foundation.h>
struct fishbone::Sound::Impl {

View file

@ -1,9 +0,0 @@
include (CTest)
include (Catch)
file(GLOB_RECURSE SRCS src/**.cc src/**.c)
add_executable(fishbone_test ${SRCS})
target_link_libraries(fishbone_test PRIVATE fishbone Catch2::Catch2WithMain)
target_include_directories(fishbone_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
catch_discover_tests(fishbone_test)

View file

@ -1 +0,0 @@
#include <catch2/catch_test_macros.hpp>