diff --git a/.gitmodules b/.gitmodules index 1f2850e..e6bcc4f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "third_party/libpixel"] path = third_party/libpixel url = https://github.com/modeco80/libpixel.git -[submodule "third_party/indicators"] - path = third_party/indicators - url = https://github.com/p-ranav/indicators diff --git a/CMakeLists.txt b/CMakeLists.txt index ee66adc..ef3ca99 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,25 @@ project(EuropaTools DESCRIPTION "Tools for working with LEC Europa based games (Star Wars: Starfighter & Star Wars: Jedi Starfighter)" ) +include(FetchContent) + +# declare dependencies +FetchContent_Declare(indicators + GIT_REPOSITORY https://github.com/p-ranav/indicators.git + ) + +FetchContent_Declare(argparse + GIT_REPOSITORY https://github.com/p-ranav/argparse.git + ) + +# Future (maybe when libpixel has provisioning for installs :v) +#FetchContent_Declare(libpixel +# GIT_REPOSITORY https://github.com/modeco80/libpixel.git +# ) + +FetchContent_MakeAvailable(indicators argparse) + add_subdirectory(third_party/libpixel) -add_subdirectory(third_party/indicators) add_subdirectory(src/libeuropa) add_subdirectory(src/tools) diff --git a/third_party/indicators b/third_party/indicators deleted file mode 160000 index 6432875..0000000 --- a/third_party/indicators +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6432875ef4c866d25e324c19a787b5bb90b0ab12