Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake: clean up unity file handling #3730

Merged
merged 3 commits into from Aug 10, 2020

Conversation

tjhei
Copy link
Member

@tjhei tjhei commented Aug 7, 2020

follow-up to #3724

  • comment things
  • move world builder unity logic into the IF()
  • clarify a couple of namespaces (not strictly necessary right now, but this should make things more robust)

@tjhei tjhei changed the title CMake: clean up unity file handling WIP: CMake: clean up unity file handling Aug 7, 2020
@tjhei tjhei changed the title WIP: CMake: clean up unity file handling CMake: clean up unity file handling Aug 7, 2020
@tjhei
Copy link
Member Author

tjhei commented Aug 7, 2020

ready for review.

@@ -144,9 +144,23 @@ if(ASPECT_WITH_WORLD_BUILDER)
CONFIGURE_FILE("${WORLD_BUILDER_SOURCE_DIR}/source/config.cc.in" "${CMAKE_BINARY_DIR}/world_builder_config.cc" @ONLY)
LIST(INSERT TARGET_SRC 0 "${CMAKE_BINARY_DIR}/world_builder_config.cc")

# Move some file to the end for unity builds to make sure other file come
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just as a clarification for me, this text is just to explain what happens, e.g. the code has not changed in functionality, or has it? As far as I can see you only moved the foreach code up, and accounted for that the source file contains the full name. Is that correct?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct.

@MFraters
Copy link
Member

Looks good to me. I does need a rebuild, but I am not sure if I can do that ( /rebuild )

@bangerth bangerth merged commit 09ca705 into geodynamics:master Aug 10, 2020
@tjhei tjhei deleted the cmake_unity_cleanup branch August 10, 2020 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants