Skip to content

fix(ci): find Conan shims on Windows #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
irvingouj@Devolutions (irvingoujAtDevolution) merged 1 commit into from
Aug 12, 2026
Merged

fix(ci): find Conan shims on Windows #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/ConanHelper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand Down