-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Detect OpenMP on macOS with Apple's Clang (rebased on master
)
#13350
Detect OpenMP on macOS with Apple's Clang (rebased on master
)
#13350
Conversation
This will be needed by the Apple compiler
In case the OpenMP definition adds things like preprocessor directives or include paths, like when building on MacOS with OpenMP from Homebrew.
It was probably done this way originally since we didn't have the `fatal` keyword argument to avoid triggering the fatal-meson-warnings. While we're here, replace the use of a `if bool` with an `else` on the for loop.
And into the Clang-CL mixin.
Which requires injecting some extra paths and the `-Xpreprocess` flag, as well as extra search paths for libomp and the headers. Fixes: mesonbuild#7435
Instead of making the variable optional, just return if we hit the error case, since that's all that's going to happen anyway
18ff903
to
5f7c221
Compare
OK thanks a lot for your feed-back, I used rebase this time and force pushed.
@dcbaker no worries, I completely understand and thanks a lot for you work on this! |
Since this is a fairly hefty change, it will only be considered for 1.5 if there is an rc2. |
main
merged)master
)
I think we are going to want an rc2 anyway. Changes look good to me. In it goes. |
Great to see this merged, thanks a lot everyone 🙏! |
Supersedes and closes #13079. I followed @tristan957's advice in #13079 (comment).