tribits_add_option_and_define(): restore optional macro define var arg, refactor (#516) #521
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
…g, refactor (TriBITSPub#516) In PR TriBITSPub#520, I accidentally put a requirement that the macro var name had to be set. Turns out, there is special logic for it to not be set. The documentation nor any TriBITS test hinted to this. But the file muelu/CMakeLists.txt actually calls tribits_add_option_and_define() with an empty macro var name. To catch this use case, I added unit tests (which will fail if you undo this patch). In order for the unit tests to cover what is needed, I had to factor out the function tribits_pkg_export_cache_var() into its own module TribitsPkgExportCacheVars.cmake so it could be included in the unit test driver. Then, I decided it would be a good idea to factor out a function tribits_pkg_append_set_commands_for_exported_vars() that is called in the module TribitsWriteClientExportFiles.cmake. Lastly, I moved the function tribits_assert_cache_and_local_vars_same_value() into this module as well. This encapsulates all of the logic to export of these package cache vars into a single module (with just a few dependencies).
rabartlett1972
approved these changes
Aug 24, 2022
There was a problem hiding this comment.
Going to allow merge since this is breaking Charon + Trilinos integration (trilinos/Trilinos#10925).
Then can set up for post-merge review.
|
@KyleFromKitware, can you please do a post-merge review of this PR? I had to rush to merge it because TriBITS 'master' was breaking customer code (see trilinos/Trilinos#10925). |
|
FYI: Using the same approach as described in #520 (comment), I reverted the patch in this PR and was able to reproduce the Trilinos configure error: But after applying this PR commit patch, the Trilinos configure completes showing: So I am confident this is fixing the problem reported in trilinos/Trilinos#10925 |
bartlettroscoe
added a commit
that referenced
this pull request
Aug 26, 2022
This is a safer way to check for an empty var I have found in the past. Something strange happens with macro arguments (at least in older versions of CMake). This is in response to feedback from @KyleFromKitware while reviewing PR #521.
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.
Follow-up from PR #520, addresses #516
See commit log msg for details.
NOTE: This should fix the error reported in trilinos/Trilinos#10925 (@glhenni).