Skip to content

Commit 28dec6c

Browse files
fanquakefanquake
committed
Merge bitcoin/bitcoin#31268: cmake: add optional source files to bitcoin_crypto and crc32c directly
9cf746d cmake: add optional source files to crc32c directly (Daniel Pfeifer) 9c7823c cmake: add optional source files to bitcoin_crypto directly (Daniel Pfeifer) Pull request description: Avoid having many static libraries by adding the optional sources to the target `bitcoin_crypto` directly. Set the necessary compile options at the source file level, rather than the target level. fixes: #31697 ACKs for top commit: s373nZ: ACK 9cf746d hebasto: re-ACK 9cf746d. TheCharlatan: ACK 9cf746d Tree-SHA512: 04b468ccbd284d63fc83b382177bb8183b325369835c3b92e555e159955c73d71712a63a2e556f8da68a1232ac07d3845e11f1057c50666843db91db98fca979
2 parents 50afaf3 + 9cf746d commit 28dec6c

File tree

3 files changed

+31
-50
lines changed

3 files changed

+31
-50
lines changed

‎cmake/crc32c.cmake

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -78,46 +78,35 @@ check_cxx_source_compiles_with_flags("${ARM64_CRC_CXXFLAGS}" "
7878
" HAVE_ARM64_CRC32C
7979
)
8080

81-
add_library(crc32c_common INTERFACE)
82-
target_compile_definitions(crc32c_common INTERFACE
81+
add_library(crc32c STATIC EXCLUDE_FROM_ALL
82+
${PROJECT_SOURCE_DIR}/src/crc32c/src/crc32c.cc
83+
${PROJECT_SOURCE_DIR}/src/crc32c/src/crc32c_portable.cc
84+
)
85+
target_compile_definitions(crc32c PRIVATE
8386
HAVE_BUILTIN_PREFETCH=$<BOOL:${HAVE_BUILTIN_PREFETCH}>
8487
HAVE_MM_PREFETCH=$<BOOL:${HAVE_MM_PREFETCH}>
8588
HAVE_STRONG_GETAUXVAL=$<BOOL:${HAVE_STRONG_GETAUXVAL}>
8689
BYTE_ORDER_BIG_ENDIAN=$<STREQUAL:${CMAKE_CXX_BYTE_ORDER},BIG_ENDIAN>
8790
HAVE_SSE42=$<BOOL:${HAVE_SSE42}>
8891
HAVE_ARM64_CRC32C=$<BOOL:${HAVE_ARM64_CRC32C}>
8992
)
90-
target_link_libraries(crc32c_common INTERFACE
91-
core_interface
92-
)
93-
94-
add_library(crc32c STATIC EXCLUDE_FROM_ALL
95-
${PROJECT_SOURCE_DIR}/src/crc32c/src/crc32c.cc
96-
${PROJECT_SOURCE_DIR}/src/crc32c/src/crc32c_portable.cc
97-
)
9893
target_include_directories(crc32c
9994
PUBLIC
10095
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/crc32c/include>
10196
)
102-
target_link_libraries(crc32c PRIVATE crc32c_common)
97+
target_link_libraries(crc32c PRIVATE core_interface)
10398
set_target_properties(crc32c PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
10499

105100
if(HAVE_SSE42)
106-
add_library(crc32c_sse42 STATIC EXCLUDE_FROM_ALL
107-
${PROJECT_SOURCE_DIR}/src/crc32c/src/crc32c_sse42.cc
108-
)
109-
target_compile_options(crc32c_sse42 PRIVATE ${SSE42_CXXFLAGS})
110-
target_link_libraries(crc32c_sse42 PRIVATE crc32c_common)
111-
set_target_properties(crc32c_sse42 PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
112-
target_link_libraries(crc32c PRIVATE crc32c_sse42)
101+
set(_crc32_src ${PROJECT_SOURCE_DIR}/src/crc32c/src/crc32c_sse42.cc)
102+
target_sources(crc32c PRIVATE ${_crc32_src})
103+
set_property(SOURCE ${_crc32_src} PROPERTY COMPILE_OPTIONS ${SSE42_CXXFLAGS})
113104
endif()
114105

115106
if(HAVE_ARM64_CRC32C)
116-
add_library(crc32c_arm64 STATIC EXCLUDE_FROM_ALL
117-
${PROJECT_SOURCE_DIR}/src/crc32c/src/crc32c_arm64.cc
118-
)
119-
target_compile_options(crc32c_arm64 PRIVATE ${ARM64_CRC_CXXFLAGS})
120-
target_link_libraries(crc32c_arm64 PRIVATE crc32c_common)
121-
set_target_properties(crc32c_arm64 PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
122-
target_link_libraries(crc32c PRIVATE crc32c_arm64)
107+
set(_crc32_src ${PROJECT_SOURCE_DIR}/src/crc32c/src/crc32c_arm64.cc)
108+
target_sources(crc32c PRIVATE ${_crc32_src})
109+
set_property(SOURCE ${_crc32_src} PROPERTY COMPILE_OPTIONS ${ARM64_CRC_CXXFLAGS})
123110
endif()
111+
112+
unset(_crc32_src)

‎contrib/devtools/check-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ declare -A LIBS
88
LIBS[cli]="libbitcoin_cli.a"
99
LIBS[common]="libbitcoin_common.a"
1010
LIBS[consensus]="libbitcoin_consensus.a"
11-
LIBS[crypto]="crypto/libbitcoin_crypto.a crypto/libbitcoin_crypto_x86_shani.a crypto/libbitcoin_crypto_sse41.a crypto/libbitcoin_crypto_avx2.a"
11+
LIBS[crypto]="crypto/libbitcoin_crypto.a"
1212
LIBS[node]="libbitcoin_node.a"
1313
LIBS[util]="util/libbitcoin_util.a"
1414
LIBS[wallet]="wallet/libbitcoin_wallet.a"

‎src/crypto/CMakeLists.txt

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,41 +28,33 @@ target_link_libraries(bitcoin_crypto
2828
)
2929

3030
if(HAVE_SSE41)
31-
add_library(bitcoin_crypto_sse41 STATIC EXCLUDE_FROM_ALL
32-
sha256_sse41.cpp
31+
target_compile_definitions(bitcoin_crypto PRIVATE ENABLE_SSE41)
32+
target_sources(bitcoin_crypto PRIVATE sha256_sse41.cpp)
33+
set_property(SOURCE sha256_sse41.cpp PROPERTY
34+
COMPILE_OPTIONS ${SSE41_CXXFLAGS}
3335
)
34-
target_compile_definitions(bitcoin_crypto_sse41 PUBLIC ENABLE_SSE41)
35-
target_compile_options(bitcoin_crypto_sse41 PRIVATE ${SSE41_CXXFLAGS})
36-
target_link_libraries(bitcoin_crypto_sse41 PRIVATE core_interface)
37-
target_link_libraries(bitcoin_crypto PRIVATE bitcoin_crypto_sse41)
3836
endif()
3937

4038
if(HAVE_AVX2)
41-
add_library(bitcoin_crypto_avx2 STATIC EXCLUDE_FROM_ALL
42-
sha256_avx2.cpp
39+
target_compile_definitions(bitcoin_crypto PRIVATE ENABLE_AVX2)
40+
target_sources(bitcoin_crypto PRIVATE sha256_avx2.cpp)
41+
set_property(SOURCE sha256_avx2.cpp PROPERTY
42+
COMPILE_OPTIONS ${AVX2_CXXFLAGS}
4343
)
44-
target_compile_definitions(bitcoin_crypto_avx2 PUBLIC ENABLE_AVX2)
45-
target_compile_options(bitcoin_crypto_avx2 PRIVATE ${AVX2_CXXFLAGS})
46-
target_link_libraries(bitcoin_crypto_avx2 PRIVATE core_interface)
47-
target_link_libraries(bitcoin_crypto PRIVATE bitcoin_crypto_avx2)
4844
endif()
4945

5046
if(HAVE_SSE41 AND HAVE_X86_SHANI)
51-
add_library(bitcoin_crypto_x86_shani STATIC EXCLUDE_FROM_ALL
52-
sha256_x86_shani.cpp
47+
target_compile_definitions(bitcoin_crypto PRIVATE ENABLE_SSE41 ENABLE_X86_SHANI)
48+
target_sources(bitcoin_crypto PRIVATE sha256_x86_shani.cpp)
49+
set_property(SOURCE sha256_x86_shani.cpp PROPERTY
50+
COMPILE_OPTIONS ${X86_SHANI_CXXFLAGS}
5351
)
54-
target_compile_definitions(bitcoin_crypto_x86_shani PUBLIC ENABLE_SSE41 ENABLE_X86_SHANI)
55-
target_compile_options(bitcoin_crypto_x86_shani PRIVATE ${X86_SHANI_CXXFLAGS})
56-
target_link_libraries(bitcoin_crypto_x86_shani PRIVATE core_interface)
57-
target_link_libraries(bitcoin_crypto PRIVATE bitcoin_crypto_x86_shani)
5852
endif()
5953

6054
if(HAVE_ARM_SHANI)
61-
add_library(bitcoin_crypto_arm_shani STATIC EXCLUDE_FROM_ALL
62-
sha256_arm_shani.cpp
55+
target_compile_definitions(bitcoin_crypto PRIVATE ENABLE_ARM_SHANI)
56+
target_sources(bitcoin_crypto PRIVATE sha256_arm_shani.cpp)
57+
set_property(SOURCE sha256_arm_shani.cpp PROPERTY
58+
COMPILE_OPTIONS ${ARM_SHANI_CXXFLAGS}
6359
)
64-
target_compile_definitions(bitcoin_crypto_arm_shani PUBLIC ENABLE_ARM_SHANI)
65-
target_compile_options(bitcoin_crypto_arm_shani PRIVATE ${ARM_SHANI_CXXFLAGS})
66-
target_link_libraries(bitcoin_crypto_arm_shani PRIVATE core_interface)
67-
target_link_libraries(bitcoin_crypto PRIVATE bitcoin_crypto_arm_shani)
6860
endif()

0 commit comments

Comments
 (0)