-
-
Notifications
You must be signed in to change notification settings - Fork 6.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
cmake: Fix build with GSSAPI #3744
Conversation
The coverage decrease seems to be false. Only CMake files changed and the coverage build is done with the autotools... |
I suggest squash
|
@jay If that's how you want to have it - no problem. I was just trying to make one thing per commit (if not for the clear history, then at least for review). |
@jzakrzewski you've just added more changes then required to solve #3743 :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Yeah, I've sneaked in some simple cleanup and my initial (but insufficient) solution using the |
Anything you want to leave separate please add |
Now it's hopefully nicer :) |
Yes it's better but I have some formatting suggestions for each:
|
- Remove nneeded include_regular_expression. It was setting what is already a default. - Remove duplicated include. - Don't check for pre-3.0.0 CMake version. We already require at least 3.0.0, so it's just clutter. Ref: curl#3744
With CMAKE_TRY_COMPILE_TARGET_TYPE set to STATIC_LIBRARY, the try_compile() (which is used by check_c_source_compiles()) will build static library instead of executable. This avoids linking additional libraries in and thus speeds up those checks a little. This commit also avoids curl#3743 (GSSAPI build errors) on itself with cmake 3.6 or above. That issue was fixed separately for all versions. Ref: curl#3744
Looking good. All the CI failures appear due to transient stalls and can be ignored. The coveralls 7% reduction in coverage doesn't make any sense to me. |
- Remove nneeded include_regular_expression. It was setting what is already a default. - Remove duplicated include. - Don't check for pre-3.0.0 CMake version. We already require at least 3.0.0, so it's just clutter. Ref: #3744
With CMAKE_TRY_COMPILE_TARGET_TYPE set to STATIC_LIBRARY, the try_compile() (which is used by check_c_source_compiles()) will build static library instead of executable. This avoids linking additional libraries in and thus speeds up those checks a little. This commit also avoids #3743 (GSSAPI build errors) on itself with cmake 3.6 or above. That issue was fixed separately for all versions. Ref: #3744
This primarily fixes #3743