Skip to content

Commit 9afa37e

Browse files
authored
Merge pull request #30275 from akyrtzi/cmake-blocks-runtime-under-stdlib
[CMake] Move the `_add_swift_target_library_single()` call for `BlocksRuntimeStub` under the `SWIFT_BUILD_STDLIB` check
2 parents 9046799 + 85a5e5a commit 9afa37e

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

test/CMakeLists.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -240,30 +240,30 @@ foreach(SDK ${SWIFT_SDKS})
240240
set(test_dependencies)
241241
get_test_dependencies("${SDK}" test_dependencies)
242242

243-
# NOTE create a stub BlocksRuntime library that can be used for the
244-
# reflection tests
245-
file(WRITE ${test_bin_dir}/Inputs/BlocksRuntime.c
246-
"void
243+
if(SWIFT_BUILD_STDLIB AND SWIFT_INCLUDE_TESTS)
244+
# NOTE create a stub BlocksRuntime library that can be used for the
245+
# reflection tests
246+
file(WRITE ${test_bin_dir}/Inputs/BlocksRuntime.c
247+
"void
247248
#if defined(_WIN32)
248249
__declspec(dllexport)
249250
#endif
250251
_Block_release(void) { }\n")
251-
_add_swift_target_library_single(
252-
BlocksRuntimeStub${VARIANT_SUFFIX}
253-
BlocksRuntimeStub
254-
SHARED
255-
ARCHITECTURE ${ARCH}
256-
SDK ${SDK}
257-
INSTALL_IN_COMPONENT dev
258-
${test_bin_dir}/Inputs/BlocksRuntime.c)
259-
set_target_properties(BlocksRuntimeStub${VARIANT_SUFFIX} PROPERTIES
260-
ARCHIVE_OUTPUT_DIRECTORY ${test_bin_dir}
261-
LIBRARY_OUTPUT_DIRECTORY ${test_bin_dir}
262-
RUNTIME_OUTPUT_DIRECTORY ${test_bin_dir}
263-
OUTPUT_NAME BlocksRuntime)
264-
list(APPEND test_dependencies BlocksRuntimeStub${VARIANT_SUFFIX})
252+
_add_swift_target_library_single(
253+
BlocksRuntimeStub${VARIANT_SUFFIX}
254+
BlocksRuntimeStub
255+
SHARED
256+
ARCHITECTURE ${ARCH}
257+
SDK ${SDK}
258+
INSTALL_IN_COMPONENT dev
259+
${test_bin_dir}/Inputs/BlocksRuntime.c)
260+
set_target_properties(BlocksRuntimeStub${VARIANT_SUFFIX} PROPERTIES
261+
ARCHIVE_OUTPUT_DIRECTORY ${test_bin_dir}
262+
LIBRARY_OUTPUT_DIRECTORY ${test_bin_dir}
263+
RUNTIME_OUTPUT_DIRECTORY ${test_bin_dir}
264+
OUTPUT_NAME BlocksRuntime)
265+
list(APPEND test_dependencies BlocksRuntimeStub${VARIANT_SUFFIX})
265266

266-
if(SWIFT_BUILD_STDLIB AND SWIFT_INCLUDE_TESTS)
267267
list(APPEND test_dependencies
268268
"swift-test-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")
269269

0 commit comments

Comments
 (0)