Rename main cmake/CMakeLists.txt to CMakeLists.txt #9603
Conversation
| @@ -0,0 +1,351 @@ | |||
| # Minimum CMake required | |||
There was a problem hiding this comment.
Could you do a git mv from the old location so that we can preserve the history of this file?
There was a problem hiding this comment.
I actually did git mv cmake/CMakeLists.txt CMakeLists.txt and later separate git add cmake/CMakeLists.txt for new file.
The only way to do what you want seems to be to have 2 separate commits.
Should I do it?
There was a problem hiding this comment.
Actually never mind what I said. From reading some more I think I misunderstood how Git handles file moves and copies. If I understand correctly now, Git doesn't try to express file moves through metadata but instead just tries to detect them after the fact. It's too bad the GitHub UI doesn't show the diff better, though.
There was a problem hiding this comment.
I have split those changes into 2 commits, and added a clean-up commit (protobuf_source_dir -> protobuf_SOURCE_DIR), so if you merge these changes as 3 separate commits (not squashed), then history should be better shown.
There was a problem hiding this comment.
Awesome! I will take a closer look soon, but my only major concern so far is I think this change is a bit too big to try to get into the 3.20.0 release given that the release is already in progress. Would you mind rebasing this pull request to be against the master branch instead? I can first merge 3.20.x into master if that will help.
There was a problem hiding this comment.
OK. Please merge 3.20.x into master, and I will re-base these changes against master...
There was a problem hiding this comment.
Ok, 3.20.x has now been merged into master.
…variable (protocolbuffers#9596) protobuf_source_dir variable is no longer needed and has the same value as protobuf_SOURCE_DIR variable, which is instance of CMake-standard <PROJECT-NAME>_SOURCE_DIR variable: https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_SOURCE_DIR.html
|
Thanks, @Arfrever! |
cmake/CMakeLists.txt is kept for compatibility and it includes CMakeLists.txt.
Fixes: #9596