switch form submodule to fetch content

This commit is contained in:
Green Sky 2023-10-25 19:37:13 +02:00
parent 55ed8ffbf9
commit a52218ad2f
No known key found for this signature in database
4 changed files with 16 additions and 12 deletions

6
.gitmodules vendored
View File

@ -1,12 +1,6 @@
[submodule "external/solanaceae_message3"]
path = external/solanaceae_message3
url = https://github.com/Green-Sky/solanaceae_message3.git
[submodule "external/entt/entt"] [submodule "external/entt/entt"]
path = external/entt/entt path = external/entt/entt
url = https://github.com/skypjack/entt.git url = https://github.com/skypjack/entt.git
[submodule "external/solanaceae_util"] [submodule "external/solanaceae_util"]
path = external/solanaceae_util path = external/solanaceae_util
url = https://github.com/Green-Sky/solanaceae_util.git url = https://github.com/Green-Sky/solanaceae_util.git
[submodule "external/solanaceae_contact"]
path = external/solanaceae_contact
url = https://github.com/Green-Sky/solanaceae_contact.git

View File

@ -1,14 +1,26 @@
cmake_minimum_required(VERSION 3.24 FATAL_ERROR) cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
include(FetchContent)
add_subdirectory(./solanaceae_util) add_subdirectory(./solanaceae_util)
#add_subdirectory(./solanaceae_plugin)
add_subdirectory(./entt) add_subdirectory(./entt)
add_subdirectory(./solanaceae_contact) if (NOT TARGET solanaceae_contact)
add_subdirectory(./solanaceae_message3) FetchContent_Declare(solanaceae_contact
GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_contact.git
GIT_TAG master
)
FetchContent_MakeAvailable(solanaceae_contact)
endif()
include(FetchContent) if (NOT TARGET solanaceae_message3)
FetchContent_Declare(solanaceae_message3
GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_message3.git
GIT_TAG master
)
FetchContent_MakeAvailable(solanaceae_message3)
endif()
# TODO: move to clamav.cmake # TODO: move to clamav.cmake
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)

@ -1 +0,0 @@
Subproject commit 5ff7d1cee0c3ed22f9fe7d66021d95ad1c5a3f04

@ -1 +0,0 @@
Subproject commit 48fb5f0889404370006ae12b3637a77d7d4ba485