Skip to content

Un-hardcode cmake install directories #783

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
Mar 13, 2023
Merged

Un-hardcode cmake install directories #783

merged 1 commit into from
Mar 13, 2023

Conversation

tristanlabelle
Copy link
Contributor

CMake install places binary files under the CMAKE_INSTALL_BINDIR subdirectory, but some CMake files hardcode bin instead (the default values). This change un-hardcodes this. This has no effect by default, but it will allow redirecting the binaries to a different output directory, which will help with packaging installers for multiple architectures in the Windows build.

@MaxDesiatov MaxDesiatov requested a review from compnerd March 9, 2023 21:23
Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

https://github.com/apple/swift-corelibs-libdispatch/blob/main/CMakeLists.txt#L83

We already use GNUInstallDirs which will initialise this to bin, so this should be a no-op change for most.

@compnerd
Copy link
Member

compnerd commented Mar 9, 2023

@swift-ci please test

@tristanlabelle tristanlabelle marked this pull request as ready for review March 9, 2023 23:36
@compnerd compnerd merged commit e7c4416 into swiftlang:main Mar 13, 2023
@tristanlabelle tristanlabelle deleted the unhardcode-cmake-install-dirs branch March 13, 2023 18:08
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.

2 participants