From 1e17cd41e61cbed5650df1046ba8f368795baf53 Mon Sep 17 00:00:00 2001 From: snider Date: Mon, 6 Oct 2025 17:04:54 +0100 Subject: [PATCH] Update permissions in build-docs.yml and adjust Conan installation paths in GetConan.cmake --- .github/workflows/build-docs.yml | 2 +- cmake/GetConan.cmake | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 93c910bb..3fbcd9fb 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -1,6 +1,6 @@ name: docs permissions: - contents: read + contents: write on: workflow_call: diff --git a/cmake/GetConan.cmake b/cmake/GetConan.cmake index ebbf2359..a1796dab 100644 --- a/cmake/GetConan.cmake +++ b/cmake/GetConan.cmake @@ -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()