File tree Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -8,14 +8,10 @@ include(AddWindowsResources)
8
8
configure_file (${PROJECT_SOURCE_DIR} /cmake/bitcoin-config.h.in config/bitcoin-config.h USE_SOURCE_PERMISSIONS @ONLY )
9
9
include_directories (${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
10
10
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.
14
11
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"
19
15
VERBATIM
20
16
)
21
17
add_library (bitcoin_clientversion OBJECT EXCLUDE_FROM_ALL
Original file line number Diff line number Diff line change @@ -24,8 +24,8 @@ const std::string CLIENT_NAME("Satoshi");
24
24
25
25
26
26
#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),
29
29
// could contain only one line of the following:
30
30
// - "#define BUILD_GIT_TAG ...", if the top commit is tagged
31
31
// - "#define BUILD_GIT_COMMIT ...", if the top commit is not tagged
You can’t perform that action at this time.
0 commit comments