diff --git a/.gitmodules b/.gitmodules index 246ac767..05b2931f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,4 @@ url = https://github.com/lionkor/commandline [submodule "vcpkg"] path = vcpkg - url = https://github.com/Microsoft/vcpkg.git -[submodule "deps/toml11"] - path = deps/toml11 - url = https://github.com/ToruNiina/toml11 + url = https://github.com/Microsoft/vcpkg.git \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 67e758d6..63e63df5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,19 @@ project( include(cmake/StandardSettings.cmake) include(cmake/StaticAnalyzers.cmake) include(cmake/Git.cmake) +include(FetchContent) + +# Fetch packages before proceeding + +include(FetchContent) +FetchContent_Declare( + toml11 + GIT_REPOSITORY https://github.com/ToruNiina/toml11.git + GIT_TAG v4.4.0 +) +FetchContent_MakeAvailable(toml11) + +# done fetching packages # below are options which should be changed @@ -118,7 +131,7 @@ find_package(libzip CONFIG REQUIRED) find_package(RapidJSON CONFIG REQUIRED) find_package(sol2 CONFIG REQUIRED) find_package(CURL CONFIG REQUIRED) -add_subdirectory("deps/toml11") +#add_subdirectory("deps/toml11") include_directories(include) diff --git a/deps/toml11 b/deps/toml11 deleted file mode 160000 index f33ca743..00000000 --- a/deps/toml11 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f33ca743fb105bf54293cc822f56cf2794d15bf2