Move toml11 out of vcpkg since the toml11 authors broke it (#352)

This commit is contained in:
Lion
2024-09-18 16:18:38 +02:00
committed by GitHub
7 changed files with 15 additions and 13 deletions
+3
View File
@@ -4,3 +4,6 @@
[submodule "vcpkg"]
path = vcpkg
url = https://github.com/Microsoft/vcpkg.git
[submodule "deps/toml11"]
path = deps/toml11
url = https://github.com/ToruNiina/toml11
+1 -1
View File
@@ -116,7 +116,7 @@ find_package(httplib CONFIG REQUIRED)
find_package(libzip CONFIG REQUIRED)
find_package(RapidJSON CONFIG REQUIRED)
find_package(sol2 CONFIG REQUIRED)
find_package(toml11 CONFIG REQUIRED)
add_subdirectory("deps/toml11")
include_directories(include)
-1
View File
@@ -73,7 +73,6 @@ function(set_project_warnings project_name)
-Werror=missing-declarations
-Werror=missing-field-initializers
-Werror=ctor-dtor-privacy
-Werror=switch-enum
-Wswitch-default
-Werror=unused-result
-Werror=implicit-fallthrough
+1 -1
View File
@@ -2,7 +2,7 @@ find_package(Git)
if(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES)
if(Git_FOUND)
message(STATUS "Git found, submodule update and init")
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL "0")
Vendored Submodule
+1
Submodule deps/toml11 added at f33ca743fb
+2 -2
View File
@@ -158,7 +158,7 @@ void TConfig::FlushToFile() {
Ss << "# This is the BeamMP-Server config file.\n"
"# Help & Documentation: `https://docs.beammp.com/server/server-maintenance/`\n"
"# IMPORTANT: Fill in the AuthKey with the key you got from `https://keymaster.beammp.com/` on the left under \"Keys\"\n"
<< data;
<< toml::format(data);
auto File = std::fopen(mConfigFileName.c_str(), "w+");
if (!File) {
beammp_error("Failed to create/write to config file: " + GetPlatformAgnosticErrorString());
@@ -240,7 +240,7 @@ void TConfig::ParseFromFile(std::string_view name) {
try {
toml::value data {};
if (!mDisableConfig) {
data = toml::parse<toml::preserve_comments>(name.data());
data = toml::parse(name.data());
}
// GENERAL
+1 -2
View File
@@ -13,7 +13,6 @@
"nlohmann-json",
"openssl",
"rapidjson",
"sol2",
"toml11"
"sol2"
]
}