Skip to content

Commit 2890ef1

Browse files
hebastohebasto
committed
[FIXUP] cmake: Rework compile/link flags summary
1 parent 9b72eb1 commit 2890ef1

5 files changed

+86
-53
lines changed

‎CMakeLists.txt

+2-26
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,6 @@ setup_split_debug_script()
389389
add_maintenance_targets()
390390
add_windows_deploy_target()
391391

392-
get_target_property(definitions core_interface INTERFACE_COMPILE_DEFINITIONS)
393-
separate_by_configs(definitions)
394-
395392
message("\n")
396393
message("Configure summary")
397394
message("=================")
@@ -415,29 +412,8 @@ message(" test_bitcoin ........................ ${BUILD_TESTS}")
415412
message(" bench_bitcoin ....................... ${BUILD_BENCH}")
416413
message(" fuzz binary ......................... ${BUILD_FUZZ_BINARY}")
417414
message("")
418-
if(CMAKE_CROSSCOMPILING)
419-
set(cross_status "TRUE, for ${CMAKE_SYSTEM_NAME}, ${CMAKE_SYSTEM_PROCESSOR}")
420-
else()
421-
set(cross_status "FALSE")
422-
endif()
423-
message("Cross compiling ....................... ${cross_status}")
424-
message("Preprocessor defined macros ........... ${definitions_ALL}")
425-
message("C compiler ............................ ${CMAKE_C_COMPILER}")
426-
list(JOIN DEPENDS_C_COMPILER_FLAGS " " depends_c_flags)
427-
string(STRIP "${CMAKE_C_FLAGS} ${depends_c_flags}" combined_c_flags)
428-
message("CFLAGS ................................ ${combined_c_flags}")
429-
message("C++ compiler .......................... ${CMAKE_CXX_COMPILER}")
430-
list(JOIN DEPENDS_CXX_COMPILER_FLAGS " " depends_cxx_flags)
431-
string(STRIP "${CMAKE_CXX_FLAGS} ${depends_cxx_flags}" combined_cxx_flags)
432-
message("CXXFLAGS .............................. ${combined_cxx_flags}")
433-
include(GetTargetInterface)
434-
get_target_interface(common_compile_options core_interface COMPILE_OPTIONS)
435-
message("Common compile options ................ ${common_compile_options}")
436-
get_target_interface(common_link_options core_interface LINK_OPTIONS)
437-
message("Common link options ................... ${common_link_options}")
438-
message("Linker flags for executables .......... ${CMAKE_EXE_LINKER_FLAGS}")
439-
message("Linker flags for shared libraries ..... ${CMAKE_SHARED_LINKER_FLAGS}")
440-
print_config_flags()
415+
include(FlagsSummary)
416+
flags_summary()
441417
message("Use assembly routines ................. ${ASM}")
442418
message("Attempt to harden executables ......... ${HARDENING}")
443419
message("Treat compiler warnings as errors ..... ${WERROR}")

‎cmake/module/FlagsSummary.cmake

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Copyright (c) 2024-present The Bitcoin Core developers
2+
# Distributed under the MIT software license, see the accompanying
3+
# file COPYING or https://opensource.org/license/mit/.
4+
5+
include_guard(GLOBAL)
6+
7+
function(normalize_preprocessor_definitions definitions)
8+
if(MSVC)
9+
set(flag "/D")
10+
else()
11+
set(flag "-D")
12+
endif()
13+
separate_arguments(${definitions})
14+
set(result "")
15+
foreach(d IN LISTS ${definitions})
16+
if(NOT d)
17+
continue()
18+
endif()
19+
if(NOT d MATCHES "${flag}.*")
20+
string(PREPEND d "${flag}")
21+
endif()
22+
string(STRIP "${result} ${d}" result)
23+
endforeach()
24+
set(${definitions} "${result}" PARENT_SCOPE)
25+
endfunction()
26+
27+
function(flags_summary)
28+
include(GetTargetInterface)
29+
get_target_interface(definitions core_interface COMPILE_DEFINITIONS)
30+
include(ProcessConfigurations)
31+
separate_by_configs(definitions)
32+
33+
if(CMAKE_CROSSCOMPILING)
34+
set(cross_status "TRUE, for ${CMAKE_SYSTEM_NAME}, ${CMAKE_SYSTEM_PROCESSOR}")
35+
else()
36+
set(cross_status "FALSE")
37+
endif()
38+
message("Cross compiling ....................... ${cross_status}")
39+
40+
get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
41+
if(is_multi_config)
42+
list(JOIN CMAKE_CONFIGURATION_TYPES ", " configs)
43+
message("Available build configurations ........ ${configs}")
44+
if(CMAKE_GENERATOR MATCHES "Visual Studio")
45+
set(default_config "Debug")
46+
else()
47+
list(GET CMAKE_CONFIGURATION_TYPES 0 default_config)
48+
endif()
49+
message("Default build configuration ........... ${default_config}")
50+
string(TOUPPER "${default_config}" config_uppercase)
51+
else()
52+
message("Build configuration ................... ${CMAKE_BUILD_TYPE}")
53+
string(TOUPPER "${CMAKE_BUILD_TYPE}" config_uppercase)
54+
endif()
55+
56+
string(STRIP "${definitions_ALL} ${definitions_${config_uppercase}}" combined_cpp_flags)
57+
normalize_preprocessor_definitions(combined_cpp_flags)
58+
message("Preprocessor defined macros ........... ${combined_cpp_flags}")
59+
60+
message("C compiler ............................ ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}, ${CMAKE_C_COMPILER}")
61+
string(STRIP "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${config_uppercase}}" combined_c_flags)
62+
list(JOIN DEPENDS_C_COMPILER_FLAGS " " depends_c_flags)
63+
string(STRIP "${combined_c_flags} ${depends_c_flags}" combined_c_flags)
64+
get_target_interface(common_compile_options core_interface COMPILE_OPTIONS)
65+
string(STRIP "${combined_c_flags} ${common_compile_options}" combined_c_flags)
66+
message("C compiler flags ...................... ${combined_c_flags}")
67+
68+
message("C++ compiler .......................... ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}, ${CMAKE_CXX_COMPILER}")
69+
string(STRIP "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${config_uppercase}}" combined_cxx_flags)
70+
list(JOIN DEPENDS_CXX_COMPILER_FLAGS " " depends_cxx_flags)
71+
string(STRIP "${combined_cxx_flags} ${depends_cxx_flags}" combined_cxx_flags)
72+
string(STRIP "${combined_cxx_flags} ${common_compile_options}" combined_cxx_flags)
73+
message("C++ compiler flags .................... ${combined_cxx_flags}")
74+
75+
get_target_interface(common_link_options core_interface LINK_OPTIONS)
76+
string(STRIP "${CMAKE_EXE_LINKER_FLAGS} ${common_link_options}" combined_linker_flags)
77+
message("Linker flags .......................... ${combined_linker_flags}")
78+
endfunction()

‎cmake/module/GetTargetInterface.cmake

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ include_guard(GLOBAL)
88
function(get_target_interface var target property)
99
get_target_property(result ${target} INTERFACE_${property})
1010
if(result)
11-
string(GENEX_STRIP "${result}" result)
11+
if(NOT ${property} STREQUAL "COMPILE_DEFINITIONS")
12+
string(GENEX_STRIP "${result}" result)
13+
endif()
1214
list(JOIN result " " result)
1315
else()
1416
set(result)

‎cmake/module/ProcessConfigurations.cmake

-25
Original file line numberDiff line numberDiff line change
@@ -106,28 +106,3 @@ function(separate_by_configs options)
106106
set(${options}_${conf_upper} "${match}" PARENT_SCOPE)
107107
endforeach()
108108
endfunction()
109-
110-
function(print_config_flags)
111-
macro(print_flags config)
112-
string(TOUPPER "${config}" config_uppercase)
113-
message(" - Preprocessor defined macros ........ ${definitions_${config_uppercase}}")
114-
message(" - CFLAGS ............................. ${CMAKE_C_FLAGS_${config_uppercase}}")
115-
message(" - CXXFLAGS ........................... ${CMAKE_CXX_FLAGS_${config_uppercase}}")
116-
message(" - LDFLAGS for executables ............ ${CMAKE_EXE_LINKER_FLAGS_${config_uppercase}}")
117-
message(" - LDFLAGS for shared libraries ....... ${CMAKE_SHARED_LINKER_FLAGS_${config_uppercase}}")
118-
endmacro()
119-
120-
get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
121-
if(is_multi_config)
122-
list(JOIN CMAKE_CONFIGURATION_TYPES " " configs)
123-
message("Available build types (configurations) ${configs}")
124-
foreach(config IN LISTS CMAKE_CONFIGURATION_TYPES)
125-
message("'${config}' build type (configuration):")
126-
print_flags(${config})
127-
endforeach()
128-
else()
129-
message("Build type (configuration):")
130-
message(" - CMAKE_BUILD_TYPE ................... ${CMAKE_BUILD_TYPE}")
131-
print_flags(${CMAKE_BUILD_TYPE})
132-
endif()
133-
endfunction()

‎src/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ include(GNUInstallDirs)
66
include(AddWindowsResources)
77

88
configure_file(${CMAKE_SOURCE_DIR}/cmake/bitcoin-config.h.in config/bitcoin-config.h @ONLY)
9-
add_compile_definitions(HAVE_CONFIG_H)
9+
target_compile_definitions(core_interface INTERFACE
10+
HAVE_CONFIG_H
11+
)
1012
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
1113

1214
# After the transition from Autotools to CMake, the obj/ subdirectory

0 commit comments

Comments
 (0)