Allow passing CMAKE_MSVC_RUNTIME_LIBRARY
#1960
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks good, waiting for CI |
|
Oh wait, you need to rebase to dev branch. |
Oops, my bad, sorry. I rebased my master to dev and changed the base branch; now, we should be good. |
|
Thanks and welcome! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for configuring the MSVC runtime library type using not only
CMAKE_C_FLAGS, but alsoCMAKE_MSVC_RUNTIME_LIBRARY. If a conflict occurs when bothCMAKE_MSVC_RUNTIME_LIBRARYandCMAKE_C_FLAGSare set, a fatal error will be raised, as we agreed in #1958.Both cpp (cmake 3.28.1, MSVC 17.0) and rust (cargo 1.72.0) worked fine on my machine; I honestly don't think this change could break anything.