summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-11-18 03:10:04 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-11-18 03:10:04 +0100
commit446ecfea0b1579ce14f8ccdab35b663375ace484 (patch)
treefc8cc5e49464bd32ecbec8b38df02c276f3c37ef
parentFix hunter messing with pkg-config (diff)
downloadnheko-446ecfea0b1579ce14f8ccdab35b663375ace484.tar.xz
Try to fix lmdbxx download
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--CMakeLists.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml

index 031e140c..590304db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables: # prevent configure tzdata hanging apt install commands DEBIAN_FRONTEND: noninteractive -build-gcc7: +build-gcc9: stage: build image: ubuntu:20.04 tags: [docker] diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6340fc3c..6424f38f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -487,10 +487,10 @@ if(USE_BUNDLED_LMDBXX) lmdbxx URL "https://raw.githubusercontent.com/hoytech/lmdbxx/1.0.0/lmdb++.h" DOWNLOAD_NO_EXTRACT TRUE + CONFIGURE_COMMAND "" + BUILD_COMMAND "" ) - if(NOT lmdbxx_POPULATED) - FetchContent_Populate(lmdbxx) - endif() + FetchContent_Populate(lmdbxx) add_library(lmdbxx INTERFACE) target_include_directories(lmdbxx INTERFACE ${lmdbxx_SOURCE_DIR}) add_library(lmdbxx::lmdbxx ALIAS lmdbxx)