Skip to content

Commit

Permalink
add toml11 submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
lionkor committed Sep 18, 2024
1 parent 60f8891 commit 9927d2b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ include(cmake/Git.cmake)
### SETTINGS ###

# add all headers (.h, .hpp) to this
set(PRJ_HEADERS
set(PRJ_HEADERS
include/ArgsParser.h
include/BoostAliases.h
include/Client.h
Expand Down Expand Up @@ -93,7 +93,7 @@ set(PRJ_COMPILE_FEATURES cxx_std_20)
# set #defines (test enable/disable not included here)
set(PRJ_DEFINITIONS CPPHTTPLIB_OPENSSL_SUPPORT)
# add all libraries used by the project (WARNING: also set them in vcpkg.json!)
set(PRJ_LIBRARIES
set(PRJ_LIBRARIES
fmt::fmt
doctest::doctest
Threads::Threads
Expand All @@ -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)

Expand All @@ -125,7 +125,7 @@ include(FindThreads)

### 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.

####################
Expand Down Expand Up @@ -164,7 +164,7 @@ set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS}
)

# 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/windows_impl.cpp
deps/commandline/src/linux_impl.cpp
Expand Down
5 changes: 2 additions & 3 deletions cmake/CompilerWarnings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
# Courtesy of Jason Turner
# License here: https://github.com/cpp-best-practices/cppbestpractices/blob/master/LICENSE
#
#
# 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.

function(set_project_warnings project_name)
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deps/toml11
Submodule toml11 added at f33ca7

0 comments on commit 9927d2b

Please sign in to comment.