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

Fix Conan command path for Windows and update ARM64 processor check in GetConan.cmake

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

2
cmake/GetConan.cmake
View file

@ -48,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|arm64")
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
set(CONAN_URL ${CONAN_URL_LINUX_AARCH64})
set(CONAN_ARCHIVE_TYPE "tgz")
else()

6
cmake/conan_provider.cmake
View file

@ -565,7 +565,11 @@ macro(conan_provide_dependency method package_name)
set_property(GLOBAL PROPERTY CONAN_PROVIDE_DEPENDENCY_INVOKED TRUE)
get_property(_conan_install_success GLOBAL PROPERTY CONAN_INSTALL_SUCCESS)
if(NOT _conan_install_success)
set(CONAN_COMMAND "${CMAKE_SOURCE_DIR}/build/bin/conan/bin/conan")
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
set(CONAN_COMMAND "${CMAKE_SOURCE_DIR}/build/bin/conan.exe")
else ()
set(CONAN_COMMAND "${CMAKE_SOURCE_DIR}/build/bin/conan")
endif ()
if(NOT EXISTS ${CONAN_COMMAND})
message(STATUS "CMake-Conan: Local conan not found, attempting to download it.")
execute_process(COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_LIST_DIR}/GetConan.cmake