Fix that the generated parts of the modulemap were missing. #470
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
vgvassilev
reviewed
Mar 29, 2017
| get_property(__modulemap_extra_content GLOBAL PROPERTY ROOT_CXXMODULES_EXTRA_MODULEMAP_CONTENT) | ||
| string(REPLACE ";" "" __modulemap_extra_content "${__modulemap_extra_content}") | ||
| file(WRITE "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" "${__modulemap_extra_content}") | ||
|
|
Member
There was a problem hiding this comment.
Could you remove the extra new line?
This happened when we moved the cxxmodules code before the add_subdirectory which where responsible for filling the variable that contains the generated contents. With this patch we wait with writing the variable contents to the file until the variable actually contains the whole modulemap.
Teemperor
force-pushed
the
fixEmptyModulemap
branch
from
b0d86f8 to
ca41012
Compare
Member
|
@phsft-bot build just on slc6/clang_gcc62 with flags -Dcxxmodules=On |
Contributor
|
@phsft-bot build just on slc6/clang_gcc62 with flags -Dcxxmodules=On |
|
Starting build on |
Member
|
LGTM, despite the failures. |
gganis
pushed a commit
to gganis/root
that referenced
this pull request
Apr 3, 2017
…ject#470) This happened when we moved the cxxmodules code before the add_subdirectory which where responsible for filling the variable that contains the generated contents. With this patch we wait with writing the variable contents to the file until the variable actually contains the whole modulemap.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
This happened when we moved the cxxmodules code before the add_subdirectory
which where responsible for filling the variable that contains the generated
contents. With this patch we wait with writing the variable contents to the
file until the variable actually contains the whole modulemap.