Skip to content
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

Don't use non functional cmake versions #1562

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Don't use non functional cmake versions #1562

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1bb947
Don't use non functional cmake versions
autoantwort Jan 5, 2025
43947b6
New function
autoantwort Jan 6, 2025
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
10 changes: 9 additions & 1 deletion src/vcpkg/tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,14 @@ namespace vcpkg
out_candidate_paths.push_back(*pf / "CMake" / "bin" / "cmake.exe");
}
}

virtual bool is_acceptable(const Path& exe_path) const override
{
// the cmake version from mysys and cygwin can not be used because that version can't handle 'C:' in paths
auto path = exe_path.generic_u8string();
return !Strings::ends_with(path, "/usr/bin") && !Strings::ends_with(path, "/cygwin64/bin");
autoantwort marked this conversation as resolved.
Show resolved Hide resolved
}

#endif
virtual ExpectedL<std::string> get_version(const ToolCache&, MessageSink&, const Path& exe_path) const override
{
Expand Down Expand Up @@ -765,6 +773,7 @@ namespace vcpkg
for (auto&& candidate : candidates)
{
if (!fs.exists(candidate, IgnoreErrors{})) continue;
if (!tool_provider.is_acceptable(candidate)) continue;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The path check is cheaper then running the tool, therefore i moved the check upwards.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This improves CMake but regresses Python detection by trying to create virtual environments for versions we don't want anyway. Introduce a new virtual for CMake to use here instead?

Copy link
Contributor Author

@autoantwort autoantwort Jan 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have created the new function cheap_is_acceptable. If you have a better name, I will take it 😆

auto maybe_version = tool_provider.get_version(*this, status_sink, candidate);
log_candidate(candidate, maybe_version);
const auto version = maybe_version.get();
Expand All @@ -773,7 +782,6 @@ namespace vcpkg
if (!parsed_version) continue;
auto& actual_version = *parsed_version.get();
if (!accept_version(actual_version)) continue;
if (!tool_provider.is_acceptable(candidate)) continue;

return PathAndVersion{candidate, *version};
}
Expand Down