at 23.11-beta 63 lines 1.9 kB view raw
1diff --git a/lib/bls-signatures/python-bindings/CMakeLists.txt b/lib/bls-signatures/python-bindings/CMakeLists.txt 2index 255e3bb..5f99c3a 100644 3--- a/lib/bls-signatures/python-bindings/CMakeLists.txt 4+++ b/lib/bls-signatures/python-bindings/CMakeLists.txt 5@@ -6,8 +6,7 @@ include(FetchContent) 6 7 FetchContent_Declare( 8 pybind11 9- GIT_REPOSITORY https://github.com/pybind/pybind11.git 10- GIT_TAG v2.6.2 11+ SOURCE_DIR @pybind11_src@ 12 ) 13 FetchContent_MakeAvailable(pybind11 relic) 14 15diff --git a/CMakeLists.txt b/CMakeLists.txt 16index 6922167..23d8da6 100644 17--- a/lib/bls-signatures/CMakeLists.txt 18+++ b/lib/bls-signatures/CMakeLists.txt 19@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH 20 include(FetchContent) 21 22 FetchContent_Declare(Sodium 23- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git 24- # Latest commit at the moment this was added here 25- # Anchored to libsodium v1.0.18 26- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 27+ URL @sodium_src@ 28 ) 29 set(SODIUM_PCH "on" CACHE STRING "") 30 set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") 31 set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "") 32 FetchContent_MakeAvailable(Sodium) 33 34-if (DEFINED ENV{RELIC_MAIN}) 35- set(RELIC_GIT_TAG "origin/main") 36-else () 37- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5 38- set(RELIC_GIT_TAG "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7") 39-endif () 40- 41 message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") 42 43 FetchContent_Declare( 44 relic 45- GIT_REPOSITORY https://github.com/Chia-Network/relic.git 46- GIT_TAG ${RELIC_GIT_TAG} 47+ SOURCE_DIR @relic_src@ 48 ) 49 50 # Relic related options 51 52diff --git a/CMakeLists.txt b/CMakeLists.txt 53index 970ec74..948441a 100644 54--- a/CMakeLists.txt 55+++ b/CMakeLists.txt 56@@ -38,6 +38,7 @@ include_directories( 57 ${BLAKE3_PATH} 58 ${CMAKE_BINARY_DIR}/_deps/relic-src/include 59 ${CMAKE_BINARY_DIR}/_deps/relic-build/include 60+ @relic_src@/include 61 ) 62 63 IF (WIN32)