cmake: Generate obj/build.h header
#51
Conversation
| @@ -10,7 +10,21 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) | |||
|
|
|||
| add_subdirectory(crypto) | |||
| add_subdirectory(univalue) | |||
|
|
|||
| add_custom_target(generate_build_info | |||
There was a problem hiding this comment.
Hmm, I don't think this will re-run on each make, so it won't pick up new git checkouts will it?
In other words: in master, switching git branches, or creating a new commit, will update build.h automatically on the next make. I don't think that's the case here?
There was a problem hiding this comment.
Hmm, I don't think this will re-run on each
make, so it won't pick up new git checkouts will it?In other words: in master, switching git branches, or creating a new commit, will update build.h automatically on the next
make. I don't think that's the case here?
The target added by the add_custom_target command:
... is always considered out of date...
This ensures that the obj/build.h header is generated from scratch on every build attempt.
There was a problem hiding this comment.
Huh, ok, yep. I didn't get that at all from reading the code, but sure enough that's how it works :)
|
Found this from a quick googling, seems to be the approach we're after: https://jonathanhamberg.com/post/cmake-embedding-git-hash/ |
hebasto
force-pushed
the
cmake-staging
branch
from
6174485
to
4291baa
Compare
hebasto
force-pushed
the
231112-cmake-AB
branch
from
a528112
to
158038f
Compare
|
Rebased. |
src/CMakeLists.txt
Outdated
| add_subdirectory(util) | ||
| add_dependencies(bitcoin_util generate_build_info) |
There was a problem hiding this comment.
It's unfortunate that this is less specific than what we have in master: depending on the entire library rather than making the relationship explicit:
libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
But I suppose this will work just fine.
| @@ -10,7 +10,21 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) | |||
|
|
|||
| add_subdirectory(crypto) | |||
| add_subdirectory(univalue) | |||
|
|
|||
| add_custom_target(generate_build_info | |||
| BYPRODUCTS ${PROJECT_BINARY_DIR}/src/obj/build.h | |||
There was a problem hiding this comment.
Note that the obj is catering to autotools, trying to keep the generated files away from the source ones. In a follow-up after CMake merge, we could drop the obj/ prefix. Mind adding a note?
hebasto
force-pushed
the
231112-cmake-AB
branch
from
158038f
to
5c2c0f3
Compare
|
Addressed all @theuni's comments. |
2e2a7b5 fixup! ci: Test CMake edge cases (Hennadii Stepanov) 999527d fixup! ci: Test CMake edge cases (Hennadii Stepanov) 9591677 cmake: Add `GenerateBuildInfo.cmake` script (Hennadii Stepanov) Pull request description: This PR replaces shell `share/genbuild.sh` script with CMake `GenerateBuildInfo.cmake` script, which works on all platforms, including Windows. Fixes build on Windows after #51. Please note, that in the master branch, MSVC builds lack build info entirely. Added a CI test to ensure equivalence of the script replacement. ACKs for top commit: pablomartin4btc: tACK 2e2a7b5 Tree-SHA512: d0a4c1bbc3335a06f60fbc5752e1ab7191fcf69002f72e0109de9a5f3c9b735a0a0cfa17becadf453fe7cba521983101e6cb34b0c60a11b95c43e7658675f077
No description provided.