diff --git a/.gitmodules b/.gitmodules index d17b647..246ac76 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index be7c9d4..43a71af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -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 @@ -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) @@ -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. #################### @@ -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 diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake index c42cb17..990085e 100644 --- a/cmake/CompilerWarnings.cmake +++ b/cmake/CompilerWarnings.cmake @@ -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) @@ -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 diff --git a/deps/toml11 b/deps/toml11 new file mode 160000 index 0000000..f33ca74 --- /dev/null +++ b/deps/toml11 @@ -0,0 +1 @@ +Subproject commit f33ca743fb105bf54293cc822f56cf2794d15bf2