Skip to content

Honor CMAKE_INSTALL_BINDIR #64281

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

Closed
wants to merge 2 commits into from
Closed

Honor CMAKE_INSTALL_BINDIR #64281

wants to merge 2 commits into from

Conversation

tristanlabelle
Copy link
Contributor

@tristanlabelle tristanlabelle commented Mar 10, 2023

CMake install places binaries under the CMAKE_INSTALL_BINDIR subdirectory, but some CMake files in this repo hardcode bin instead (the default value). This change un-hardcodes them. 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.

A similar change is possible for CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_LIBEXECDIR but I am scoping it out of this PR because of logic to append LLVM_LIBDIR_SUFFIX to lib directory names.

See also:

How tested:

  • Built locally overriding CMAKE_INSTALL_BINDIR to confirm that binaries end up under the specified path
  • Built locally without overriding CMAKE_INSTALL_BINDIR to confirm that binaries end up in the same original bin folder.

@tristanlabelle tristanlabelle marked this pull request as ready for review March 10, 2023 14:07
@compnerd
Copy link
Member

CC: @buttaface (might have some thoughts on the install locations)

@compnerd
Copy link
Member

CC: @bnbarham @etcwilde

@tristanlabelle tristanlabelle changed the title Un-hardcode cmake install directories Un-hardcode cmake install bin directory Mar 15, 2023
@tristanlabelle
Copy link
Contributor Author

The latest commit scopes the PR down to only bin > CMAKE_INSTALL_BINDIR.

@tristanlabelle tristanlabelle requested a review from compnerd March 16, 2023 12:06
@tristanlabelle tristanlabelle changed the title Un-hardcode cmake install bin directory Honor CMAKE_INSTALL_BINDIR Mar 16, 2023
@compnerd
Copy link
Member

@swift-ci please test

@tristanlabelle
Copy link
Contributor Author

Closing due to age

@finagolfin
Copy link
Member

If you reopen and rebase, I'm sure we could get it in. You're supposed to keep pinging committers, that's the only way I get my pulls in.

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