Skip to content

Commit eb2ebe6

Browse files
committed
Merge bitcoin/bitcoin#31231: cmake: Fix IF_CHECK_PASSED option handling
97a18c8 cmake: Fix `IF_CHECK_PASSED` option handling (Hennadii Stepanov) Pull request description: `IF_CHECK_PASSED` is a multi-value keyword, resulting in a list value. Convert it to a string before applying any `string()` command. Split from bitcoin/bitcoin#30861. No current CMake code is affected by this bug. ACKs for top commit: theuni: utACK 97a18c8 Tree-SHA512: d2556ca38c35a8992175e9f948c2028a789e71c2b2d5fdf365b31710c8ed3d5edf5d0363853c5d750d29abb58cfda3c78cdc2971a627e5b4c61aca4ec2a33356
2 parents 5b283fa + 97a18c8 commit eb2ebe6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

cmake/module/TryAppendCXXFlags.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ function(try_append_cxx_flags flags)
7272
target_compile_options(${TACXXF_TARGET} INTERFACE ${TACXXF_IF_CHECK_PASSED})
7373
endif()
7474
if(DEFINED TACXXF_VAR)
75-
string(STRIP "${${TACXXF_VAR}} ${TACXXF_IF_CHECK_PASSED}" ${TACXXF_VAR})
75+
list(JOIN TACXXF_IF_CHECK_PASSED " " flags_if_check_passed_as_string)
76+
string(STRIP "${${TACXXF_VAR}} ${flags_if_check_passed_as_string}" ${TACXXF_VAR})
7677
endif()
7778
else()
7879
if(DEFINED TACXXF_TARGET)

cmake/module/TryAppendLinkerFlag.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ function(try_append_linker_flag flag)
4848
target_link_options(${TALF_TARGET} INTERFACE ${TALF_IF_CHECK_PASSED})
4949
endif()
5050
if(DEFINED TALF_VAR)
51-
string(STRIP "${${TALF_VAR}} ${TALF_IF_CHECK_PASSED}" ${TALF_VAR})
51+
list(JOIN TALF_IF_CHECK_PASSED " " flags_if_check_passed_as_string)
52+
string(STRIP "${${TALF_VAR}} ${flags_if_check_passed_as_string}" ${TALF_VAR})
5253
endif()
5354
else()
5455
if(DEFINED TALF_TARGET)

0 commit comments

Comments
 (0)