[v624][cmake] Protect against empty COMPILE_DEFINITIONS in genreflex and rootcint commands #12712
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
In the `rootcint` command defined in `RootMacros.cmake`, the
`COMPILE_DEFINITIONS` from the target are forwarded as compiler flags.
The `COMPILE_DEFINITIONS` are stored in the `module_defs` variable with
a generator expression:
```
set(module_defs $<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>)
```
Then, the definitions are added to the rootcint command with this
expression:
```
"$<$<BOOL:${module_defs}>:-D$<JOIN:${module_defs},;-D>>"
```
This code was almost copied exactly from the CMake documentation
example:
https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html
In particular, the `BOOL` check makes sure that the if the target
property is empty, we will not get a bare `-D` with nothing after it,
corrupting the rootcint command.
However, there is no protextion against the case where the
`COMPILE_DEFINITIONS` target property is not empty, but its elements are
empty strings! This happened to me in my recent build.
Instead of trying to figure out where the empty strings are added to the
`COMPILE_DEFINITIONS`, it is better to also protect against empty target
property elements in the CMake generator expressions, which is
implemented in this commit.
This applies the change made to ROOT_GENERATE_DICTIONARY in the main branch commit 08ab7e0 to GENREFLEX_GENERATE_DICTIONARY. This commit in conjunction with 08ab7e0 fixes root-project#11312. See commit 08ab7e0 and issue root-project#11312 for more details on the issue and solution.
This corrects the content of 6efc168 [cmake] Protect against empty COMPILE_DEFINITIONS in genreflex command
|
Starting build on |
|
Build failed on mac12/noimt. Errors:
|
|
Build failed on ROOT-performance-centos8-multicore/cxx17. Failing tests: |
|
Build failed on ROOT-ubuntu2004/python3. Failing tests:
|
|
Build failed on mac11/cxx14. Failing tests: |
pcanal
approved these changes
Apr 25, 2023
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.
Backport of these three PRs to ROOT 6.24:
COMPILE_DEFINITIONSin rootcint command #11111Like this, I can build the ROOT 6.24 branch in my Arch Linux environment again to debug some RooFit stuff.