Fix multi-config generator handling and detection #3315
Conversation
This file contains hidden or 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
Previously, multi-config generators were detected by the value of the `CMAKE_CFG_INTDIR` variable. If a multi-config generator was detected, the CMAKE_CFG_INTDIR was included. This has different values from the $<CONFIG> generator expression into which the ExternalUtil.hpp file is generated for each configuration. This change uses `CMAKE_CONFIGURATION_TYPES` for multi-config generator detection and provides a more robust dependency handling for the generated files. Additionally it uses the `$<CONFIG>` generator expression to set the include directory for multi-config generators. See onnx#3314 Signed-off-by: Jonas Ehrlich <[email protected]>
Collaborator
|
Can one of the admins verify this patch? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Previously, multi-config generators were detected by the value of the
CMAKE_CFG_INTDIRvariable. If a multi-config generator was detected, the CMAKE_CFG_INTDIR was included.This has different values from the $ generator expression into which the ExternalUtil.hpp file is generated for each configuration.
This change uses
CMAKE_CONFIGURATION_TYPESfor multi-config generator detection and provides a more robust dependency handling for the generated files. Additionally it uses the$<CONFIG>generator expression to set the include directory for multi-config generators.Closes #3314