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

[llvm][cmake] Use $<CONFIG> instead of ${CMAKE_CFG_INTDIR} for llvm-config #75417

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

Bigcheese
Copy link
Contributor

${CMAKE_CFG_INTDIR} does not work correctly for llvm-config when building with the Ninja Multi-Config generator. It tries to find files in the ${CONFIGURATION} directory. Using the $ generator expression instead fixes this.

Really this needs to be done everywhere as ${CMAKE_CFG_INTDIR} is deprecated as of 3.21 (LLVM's current min version is 3.20), but this is sufficient to get check-llvm to pass.

See https://cmake.org/cmake/help/latest/variable/CMAKE_CFG_INTDIR.html

…onfig

${CMAKE_CFG_INTDIR} does not work correctly for llvm-config when
building with the Ninja Multi-Config generator. It tries to find files
in the ${CONFIGURATION} directory. Using the $<CONFIG> generator
expression instead fixes this.

Really this needs to be done everywhere as ${CMAKE_CFG_INTDIR} is
deprecated as of 3.21 (LLVM's current min version is 3.20), but this
is sufficient to get `check-llvm` to pass.

See https://cmake.org/cmake/help/latest/variable/CMAKE_CFG_INTDIR.html
@Bigcheese Bigcheese self-assigned this Dec 14, 2023
@Bigcheese
Copy link
Contributor Author

Bigcheese commented Dec 14, 2023

Just using the PR for pre-commit testing to make sure it doesn't mess up other configs.

@Bigcheese Bigcheese merged commit f956bfe into llvm:main Dec 14, 2023
4 checks passed
@Bigcheese Bigcheese deleted the dev/fix-multi-config branch December 14, 2023 22:03
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.

None yet

1 participant