Skip to content

Commit 0dd6625

Browse files
committed
build: drop obj/ subdir for generated build.h, rename to bitcoin-build-info.h
Now that this file is not in a subfolder anymore, prefix it with "bitcoin-" to avoid potential collisions. Also add "info" for a more descriptive name.
1 parent 6fc4692 commit 0dd6625

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

src/CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@ include(AddWindowsResources)
88
configure_file(${PROJECT_SOURCE_DIR}/cmake/bitcoin-config.h.in config/bitcoin-config.h USE_SOURCE_PERMISSIONS @ONLY)
99
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
1010

11-
# TODO: After the transition from Autotools to CMake, the obj/ subdirectory
12-
# could be dropped as its only purpose was to separate a generated header
13-
# from source files.
1411
add_custom_target(generate_build_info
15-
BYPRODUCTS ${PROJECT_BINARY_DIR}/src/obj/build.h
16-
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/src/obj
17-
COMMAND ${CMAKE_COMMAND} -DBUILD_INFO_HEADER_PATH=${PROJECT_BINARY_DIR}/src/obj/build.h -DSOURCE_DIR=${PROJECT_SOURCE_DIR} -P ${PROJECT_SOURCE_DIR}/cmake/script/GenerateBuildInfo.cmake
18-
COMMENT "Generating obj/build.h"
12+
BYPRODUCTS ${PROJECT_BINARY_DIR}/src/bitcoin-build-info.h
13+
COMMAND ${CMAKE_COMMAND} -DBUILD_INFO_HEADER_PATH=${PROJECT_BINARY_DIR}/src/bitcoin-build-info.h -DSOURCE_DIR=${PROJECT_SOURCE_DIR} -P ${PROJECT_SOURCE_DIR}/cmake/script/GenerateBuildInfo.cmake
14+
COMMENT "Generating bitcoin-build-info.h"
1915
VERBATIM
2016
)
2117
add_library(bitcoin_clientversion OBJECT EXCLUDE_FROM_ALL

src/clientversion.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ const std::string CLIENT_NAME("Satoshi");
2424

2525

2626
#ifdef HAVE_BUILD_INFO
27-
#include <obj/build.h>
28-
// The <obj/build.h>, which is generated by the build environment (cmake/script/GenerateBuildInfo.cmake),
27+
#include <bitcoin-build-info.h>
28+
// The <bitcoin-build-info.h>, which is generated by the build environment (cmake/script/GenerateBuildInfo.cmake),
2929
// could contain only one line of the following:
3030
// - "#define BUILD_GIT_TAG ...", if the top commit is tagged
3131
// - "#define BUILD_GIT_COMMIT ...", if the top commit is not tagged

0 commit comments

Comments
 (0)