Skip to content

Commit 210b772

Browse files
committed
[UnitTests][Windows] Link with Synchronization.lib
The runtime unit tests also need to link with Synchronization.lib. rdar://90776105
1 parent 3bfc7e0 commit 210b772

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

unittests/Basic/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,7 @@ target_link_libraries(SwiftBasicTests
4848
clangBasic
4949
LLVMTestingSupport
5050
)
51+
52+
if(SWIFT_HOST_VARIANT STREQUAL windows)
53+
target_link_libraries(SwiftBasicTests PRIVATE Synchronization)
54+
endif()

unittests/Threading/CMakeLists.txt

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
add_swift_unittest(SwiftThreadingTests
2-
Mutex.cpp
3-
Once.cpp
4-
LinuxUlock.cpp
5-
Fatal.cpp
6-
)
1+
if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
2+
("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "${SWIFT_PRIMARY_VARIANT_ARCH}"))
3+
add_swift_unittest(SwiftThreadingTests
4+
Mutex.cpp
5+
Once.cpp
6+
LinuxUlock.cpp
7+
Fatal.cpp
8+
)
79

8-
target_link_libraries(SwiftThreadingTests
9-
PRIVATE
10-
swiftThreading${SWIFT_PRIMARY_VARIANT_SUFFIX}
11-
swiftCore${SWIFT_PRIMARY_VARIANT_SUFFIX}
12-
)
10+
target_link_libraries(SwiftThreadingTests
11+
PRIVATE
12+
swiftThreading${SWIFT_PRIMARY_VARIANT_SUFFIX}
13+
swiftCore${SWIFT_PRIMARY_VARIANT_SUFFIX}
14+
)
1315

14-
if(CMAKE_SYSTEM_NAME STREQUAL Windows)
15-
target_link_libraries(SwiftThreadingTests PRIVATE Synchronization)
16+
if(SWIFT_HOST_VARIANT STREQUAL windows)
17+
target_link_libraries(SwiftThreadingTests PRIVATE Synchronization)
18+
endif()
1619
endif()

unittests/runtime/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
6464
${EXECINFO_LIBRARY}
6565
)
6666
elseif(SWIFT_HOST_VARIANT STREQUAL windows)
67-
list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp)
67+
list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp;Synchronization)
6868
endif()
6969

7070
if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)

unittests/runtime/LongTests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
3131
${EXECINFO_LIBRARY}
3232
)
3333
elseif(SWIFT_HOST_VARIANT STREQUAL windows)
34-
list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp)
34+
list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp;Synchronization)
3535
endif()
3636

3737
add_swift_unittest(SwiftRuntimeLongTests

0 commit comments

Comments
 (0)