Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Update permissions in build-docs.yml and adjust Conan installation paths in GetConan.cmake

Browse source
This commit is contained in:
snider 2025-10-06 17:04:54 +01:00
parent 6c35d636b3
commit 1e17cd41e6
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-docs.yml vendored
View file

@ -1,6 +1,6 @@
name: docs
permissions:
contents: read
contents: write
on:
workflow_call:

14
cmake/GetConan.cmake
View file

@ -12,14 +12,18 @@ set(CONAN_URL_WINDOWS_X86_64 "https://github.com/conan-io/conan/releases/downloa
set(CONAN_URL_WINDOWS_ARM64 "https://github.com/conan-io/conan/releases/download/${CONAN_VERSION}/conan-${CONAN_VERSION}-windows-arm64.zip")
set(CONAN_URL_LINUX_X86_64 "https://github.com/conan-io/conan/releases/download/${CONAN_VERSION}/conan-${CONAN_VERSION}-linux-x86_64.tgz")
set(CONAN_URL_LINUX_AARCH64 "https://github.com/conan-io/conan/releases/download/${CONAN_VERSION}/conan-${CONAN_VERSION}-linux-aarch64.tgz")
set(CONAN_INSTALL_DIR "${CMAKE_SOURCE_DIR}/build")
# Set the installation directory
if(NOT CMAKE_BINARY_DIR)
set(CMAKE_BINARY_DIR "${CONAN_INSTALL_DIR}")
endif()
set(CONAN_EXECUTABLE "${CONAN_INSTALL_DIR}/bin/conan")
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
set(CONAN_EXECUTABLE "${CONAN_INSTALL_DIR}/bin/conan.exe")
set(CONAN_INSTALL_DIR "${CMAKE_SOURCE_DIR}/build/bin")
else ()
set(CONAN_EXECUTABLE "${CONAN_INSTALL_DIR}/bin/conan")
set(CONAN_INSTALL_DIR "${CMAKE_SOURCE_DIR}/build")
endif ()
# Check if Conan is already installed
if(NOT EXISTS "${CONAN_EXECUTABLE}")
message(STATUS "Conan not found. Downloading and installing...")
@ -44,7 +48,7 @@ if(NOT EXISTS "${CONAN_EXECUTABLE}")
set(CONAN_ARCHIVE_TYPE "zip")
endif()
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
set(CONAN_URL ${CONAN_URL_LINUX_AARCH64})
set(CONAN_ARCHIVE_TYPE "tgz")
else()