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.

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

build: simplify the build rules (NFC) #48

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Conversation

compnerd
Copy link
Contributor

Swift requires CMake 3.19.x to build. Update the minimum supported CMake to allow us to simplify the build rules somewhat by removing the workarounds for older releases. Additionally, re-order and use straightline configuration over conditional paths.

Swift requires CMake 3.19.x to build.  Update the minimum supported
CMake to allow us to simplify the build rules somewhat by removing the
workarounds for older releases.  Additionally, re-order and use
straightline configuration over conditional paths.
@compnerd
Copy link
Contributor Author

CC: @yim-lee @etcwilde

@compnerd
Copy link
Contributor Author

@swift-server-bot please test


if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
Copy link
Member

Choose a reason for hiding this comment

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

We are we removing the Darwin check? I could see a module package search working on Darwin.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It doesn't need to be isolated, it is with a CONFIG variant, so it is meant for the build output. All this does is prevent 2 lines from being printed on Darwin, it has no negative consequences.

@Lukasa Lukasa added the semver/none No version bump required. label Nov 28, 2023
@compnerd
Copy link
Contributor Author

compnerd commented Dec 1, 2023

@yim-lee can we merge this? I have a follow up change that I would like to put up.

@yim-lee yim-lee merged commit 10c2f6a into apple:main Dec 1, 2023
@compnerd compnerd deleted the simplify branch December 1, 2023 02:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
semver/none No version bump required.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants