Skip to content

Commit 73a6959

Browse files
Merge #1704: cmake: Make secp256k1_objs inherit interface defines from secp256k1
bf08222 cmake: Make `secp256k1_objs` inherit interface defines from `secp256k1` (Hennadii Stepanov) Pull request description: This PR effectively adds `-DSECP256K1_STATIC` to usage requirements of `secp256k1_objs` on Windows, preventing LNK4217 linker warnings. I overlooked this issue while reviewing #1678. ACKs for top commit: real-or-random: utACK bf08222 Tree-SHA512: d31e963378b795fd2be88f26574561f1e16b4c2fe10f348f6bfcf1bcc7e68da81ff93475548e9513514ded8eef5a0bd5e2eac2f4a9c5b879e0ab171e49dfcad5
2 parents cbbbf3b + bf08222 commit 73a6959

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ target_include_directories(secp256k1 INTERFACE
8686
$<BUILD_INTERFACE:$<$<NOT:$<BOOL:${PROJECT_IS_TOP_LEVEL}>>:${PROJECT_SOURCE_DIR}/include>>
8787
)
8888
set_target_properties(secp256k1_objs PROPERTIES
89-
INTERFACE_INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:secp256k1,INTERFACE_INCLUDE_DIRECTORIES>"
89+
INTERFACE_COMPILE_DEFINITIONS "$<TARGET_PROPERTY:secp256k1,INTERFACE_COMPILE_DEFINITIONS>"
90+
INTERFACE_INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:secp256k1,INTERFACE_INCLUDE_DIRECTORIES>"
9091
)
9192

9293
# This emulates Libtool to make sure Libtool and CMake agree on the ABI version,

0 commit comments

Comments
 (0)