From 3fc78c8cece663de63d3e76d94c894ecab2cb662 Mon Sep 17 00:00:00 2001 From: Junyi Ou Date: Wed, 12 Aug 2026 14:37:07 -0400 Subject: [PATCH] fix(ci): find Conan shims on Windows --- cmake/ConanHelper.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/ConanHelper.cmake b/cmake/ConanHelper.cmake index b5a507b..7f07d04 100644 --- a/cmake/ConanHelper.cmake +++ b/cmake/ConanHelper.cmake @@ -62,7 +62,7 @@ if(USE_CONAN) if(CADEAU_CONAN_MAJOR STREQUAL "1") include(conan) - find_program(CADEAU_CONAN1_COMMAND NAMES conan1 conan) + find_program(CADEAU_CONAN1_COMMAND NAMES conan1 conan1.cmd conan conan.cmd) if(NOT CADEAU_CONAN1_COMMAND) message(FATAL_ERROR "Could not find conan1 (or conan) in PATH.") endif() @@ -85,7 +85,7 @@ if(USE_CONAN) conan_output_dirs_setup() endif() else() - find_program(CADEAU_CONAN2_COMMAND NAMES conan2) + find_program(CADEAU_CONAN2_COMMAND NAMES conan2 conan2.cmd) if(NOT CADEAU_CONAN2_COMMAND) message(FATAL_ERROR "Could not find conan2 in PATH.") endif()