foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-12 11:19:08 -05:00
Code Issues Activity

build: drop superfluous HAVE_BUILD_INFO define

Browse source 
bitcoin-build-info.h should always be generated before clientversion.cpp
is compiled due to the following explicit dependency in src/CMakeLists.txt:

add_dependencies(bitcoin_clientversion generate_build_info)

Hence there is no need to gate the inclusion of that header with an
extra define.
This commit is contained in:
Sebastian Falbesoner 2024-09-10 15:16:28 +02:00
parent 0dd662510c
commit 7025942687
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -17,10 +17,6 @@ add_custom_target(generate_build_info
add_library(bitcoin_clientversion OBJECT EXCLUDE_FROM_ALL add_library(bitcoin_clientversion OBJECT EXCLUDE_FROM_ALL
clientversion.cpp clientversion.cpp
) )
target_compile_definitions(bitcoin_clientversion
PRIVATE
HAVE_BUILD_INFO
)
target_link_libraries(bitcoin_clientversion target_link_libraries(bitcoin_clientversion
PRIVATE PRIVATE
core_interface core_interface

2
src/clientversion.cpp
View file

@ -23,14 +23,12 @@ using util::Join;
const std::string CLIENT_NAME("Satoshi"); const std::string CLIENT_NAME("Satoshi");
#ifdef HAVE_BUILD_INFO
#include <bitcoin-build-info.h> #include <bitcoin-build-info.h>
// The <bitcoin-build-info.h>, which is generated by the build environment (cmake/script/GenerateBuildInfo.cmake), // The <bitcoin-build-info.h>, which is generated by the build environment (cmake/script/GenerateBuildInfo.cmake),
// could contain only one line of the following: // could contain only one line of the following:
// - "#define BUILD_GIT_TAG ...", if the top commit is tagged // - "#define BUILD_GIT_TAG ...", if the top commit is tagged
// - "#define BUILD_GIT_COMMIT ...", if the top commit is not tagged // - "#define BUILD_GIT_COMMIT ...", if the top commit is not tagged
// - "// No build information available", if proper git information is not available // - "// No build information available", if proper git information is not available
#endif
//! git will put "#define GIT_COMMIT_ID ..." on the next line inside archives. $Format:%n#define GIT_COMMIT_ID "%H"$ //! git will put "#define GIT_COMMIT_ID ..." on the next line inside archives. $Format:%n#define GIT_COMMIT_ID "%H"$