From 5efd4b0e6be7c30f8d0483ce0431b4281f989772 Mon Sep 17 00:00:00 2001 From: snider Date: Mon, 6 Oct 2025 17:11:47 +0100 Subject: [PATCH] Fix Conan command path for Windows and update ARM64 processor check in GetConan.cmake --- cmake/GetConan.cmake | 2 +- cmake/conan_provider.cmake | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/GetConan.cmake b/cmake/GetConan.cmake index a1796dab..af32c546 100644 --- a/cmake/GetConan.cmake +++ b/cmake/GetConan.cmake @@ -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() diff --git a/cmake/conan_provider.cmake b/cmake/conan_provider.cmake index cffc6751..c5904c5d 100644 --- a/cmake/conan_provider.cmake +++ b/cmake/conan_provider.cmake @@ -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