Use FetchContent for identiconpp
continuous-integration/drone/push Build is failing Details

This commit is contained in:
tastytea 2022-06-11 08:30:44 +02:00
parent 80ccc2c7a1
commit 528f4480aa
Signed by: tastytea
SSH Key Fingerprint: SHA256:FBkvrOlhq5use1XEttyUGT4bUTDVA1ar9SgIc9P03cM
4 changed files with 18 additions and 12 deletions

View File

@ -13,12 +13,6 @@ trigger:
- tag
steps:
- name: submodules
image: docker:git
commands:
- git submodule init
- git submodule update --recursive
- name: GCC 8 / clang 7
image: debian:buster-slim
pull: always

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "dist/identiconpp"]
path = dist/identiconpp
url = https://schlomp.space/tastytea/identiconpp

View File

@ -27,9 +27,25 @@ if(NOT libcryptopp_FOUND)
pkg_check_modules(libcryptopp REQUIRED IMPORTED_TARGET libcrypto++)
endif()
if (LIBRAVATAR_BUNDLED_IDENTICONPP)
add_subdirectory(dist/identiconpp)
include(FetchContent)
FetchContent_Declare(identiconpp
GIT_REPOSITORY https://schlomp.space/tastytea/identiconpp.git
GIT_TAG 0.7.3
)
if (NOT CMAKE_VERSION VERSION_LESS 3.14)
FetchContent_MakeAvailable(identiconpp)
else()
FetchContent_GetProperties(identiconpp)
if(NOT identiconpp_POPULATED)
FetchContent_Populate(identiconpp)
add_subdirectory(${identiconpp_SOURCE_DIR} ${identiconpp_BINARY_DIR})
endif()
endif()
add_library(identiconpp::identiconpp ALIAS identiconpp)
else()
find_package(identiconpp REQUIRED CONFIG)
endif()
find_package(identiconpp REQUIRED CONFIG)
find_package(Filesystem REQUIRED COMPONENTS Final Experimental)

1
dist/identiconpp vendored

@ -1 +0,0 @@
Subproject commit 9070f154a462abab5edca7b9050ce4f4893d3999