Skip to content

utils: add CMake to Linux checkout #26301

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.

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
merged 1 commit into from
Jul 29, 2019
Merged

Conversation

compnerd
Copy link
Member

In order to prepare for a migration to CMake 3.15 to enable the use of
the new Swift support, we will add a build of CMake for Linux to ease
the transition. This adds CMake to the checkout on Linux.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

In order to prepare for a migration to CMake 3.15 to enable the use of
the new Swift support, we will add a build of CMake for Linux to ease
the transition.  This adds CMake to the checkout on Linux.
@compnerd
Copy link
Member Author

@compnerd
Copy link
Member Author

@swift-ci please smoke test

@spevans
Copy link
Contributor

spevans commented Jul 29, 2019

Should this only checkout the cmake repo if the installed version of cmake < 3.15? I assume we will need a check like that somewhere to avoid building it as well if it doesn't need to be.

@compnerd
Copy link
Member Author

I don't think it really matters if we checkout the sources, its not a large repository and doesn't take very long to clone. I don't see such a check for clones on any of the other repositories. You are correct that we will need the check though for the build.

@shahmishal
Copy link
Member

This looks good to me, however when we enable building cmake in the build-script we should check if the dictionary exist before trying to build cmake. Otherwise we should fall back to using the system cmake.

@compnerd compnerd merged commit c072c18 into swiftlang:master Jul 29, 2019
@compnerd compnerd deleted the checkout-cmake branch July 29, 2019 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants