BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-01 07:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

add toml11 submodule

Browse Source
This commit is contained in:
Lion Kortlepel 2024-09-18 15:58:55 +02:00
parent 60f88916a9
commit 9927d2befb
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "vcpkg"] [submodule "vcpkg"]
path = vcpkg path = vcpkg
url = https://github.com/Microsoft/vcpkg.git url = https://github.com/Microsoft/vcpkg.git
[submodule "deps/toml11"]
path = deps/toml11
url = https://github.com/ToruNiina/toml11

10
CMakeLists.txt
View File

@ -20,7 +20,7 @@ include(cmake/Git.cmake)
### SETTINGS ### ### SETTINGS ###
# add all headers (.h, .hpp) to this # add all headers (.h, .hpp) to this
set(PRJ_HEADERS set(PRJ_HEADERS
include/ArgsParser.h include/ArgsParser.h
include/BoostAliases.h include/BoostAliases.h
include/Client.h include/Client.h
@ -93,7 +93,7 @@ set(PRJ_COMPILE_FEATURES cxx_std_20)
# set #defines (test enable/disable not included here) # set #defines (test enable/disable not included here)
set(PRJ_DEFINITIONS CPPHTTPLIB_OPENSSL_SUPPORT) set(PRJ_DEFINITIONS CPPHTTPLIB_OPENSSL_SUPPORT)
# add all libraries used by the project (WARNING: also set them in vcpkg.json!) # add all libraries used by the project (WARNING: also set them in vcpkg.json!)
set(PRJ_LIBRARIES set(PRJ_LIBRARIES
fmt::fmt fmt::fmt
doctest::doctest doctest::doctest
Threads::Threads Threads::Threads
@ -116,7 +116,7 @@ find_package(httplib CONFIG REQUIRED)
find_package(libzip CONFIG REQUIRED) find_package(libzip CONFIG REQUIRED)
find_package(RapidJSON CONFIG REQUIRED) find_package(RapidJSON CONFIG REQUIRED)
find_package(sol2 CONFIG REQUIRED) find_package(sol2 CONFIG REQUIRED)
find_package(toml11 CONFIG REQUIRED) add_subdirectory("deps/toml11")
include_directories(include) include_directories(include)
@ -125,7 +125,7 @@ include(FindThreads)
### END SETTINGS ### ### END SETTINGS ###
# DONT change anything beyond this point unless you've read the cmake bible and # DONT change anything beyond this point unless you've read the cmake bible and
# swore on it not to bonk up the ci/cd pipelines with your changes. # swore on it not to bonk up the ci/cd pipelines with your changes.
#################### ####################
@ -164,7 +164,7 @@ set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS}
) )
# build commandline manually for funky windows flags to carry over without a custom toolchain file # build commandline manually for funky windows flags to carry over without a custom toolchain file
add_library(commandline_static add_library(commandline_static
deps/commandline/src/impls.h deps/commandline/src/impls.h
deps/commandline/src/windows_impl.cpp deps/commandline/src/windows_impl.cpp
deps/commandline/src/linux_impl.cpp deps/commandline/src/linux_impl.cpp

5
cmake/CompilerWarnings.cmake
View File

@ -3,9 +3,9 @@
# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md # https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
# Courtesy of Jason Turner # Courtesy of Jason Turner
# License here: https://github.com/cpp-best-practices/cppbestpractices/blob/master/LICENSE # License here: https://github.com/cpp-best-practices/cppbestpractices/blob/master/LICENSE
# #
# This version has been modified by the owners of the current respository. # This version has been modified by the owners of the current respository.
# Modifications have mostly been marked with "modified" or similar, though this is not # Modifications have mostly been marked with "modified" or similar, though this is not
# strictly required. # strictly required.
function(set_project_warnings project_name) function(set_project_warnings project_name)
@ -73,7 +73,6 @@ function(set_project_warnings project_name)
-Werror=missing-declarations -Werror=missing-declarations
-Werror=missing-field-initializers -Werror=missing-field-initializers
-Werror=ctor-dtor-privacy -Werror=ctor-dtor-privacy
-Werror=switch-enum
-Wswitch-default -Wswitch-default
-Werror=unused-result -Werror=unused-result
-Werror=implicit-fallthrough -Werror=implicit-fallthrough

1
deps/toml11 vendored Submodule

@ -0,0 +1 @@
Subproject commit f33ca743fb105bf54293cc822f56cf2794d15bf2