Skip to content

Commit 575c80d

Browse files
committed
tests: update Win expected libs, target_link_libraries
1 parent 81e77da commit 575c80d

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ IF(WIN32)
1515
client
1616
debug "${CMAKE_SOURCE_DIR}/target/debug/rustls_ffi.lib"
1717
optimized "${CMAKE_SOURCE_DIR}/target/release/rustls_ffi.lib"
18-
advapi32.lib credui.lib kernel32.lib secur32.lib legacy_stdio_definitions.lib kernel32.lib advapi32.lib userenv.lib kernel32.lib kernel32.lib ws2_32.lib bcrypt.lib msvcrt.lib legacy_stdio_definitions.lib userenv.lib kernel32.lib msvcrt.lib ntdll.lib Synchronization.lib
18+
advapi32.lib bcrypt.lib crypt32.lib cryptnet.lib kernel32.lib ncrypt.lib bcrypt.lib advapi32.lib legacy_stdio_definitions.lib kernel32.lib advapi32.lib kernel32.lib ntdll.lib userenv.lib ws2_32.lib synchronization.lib kernel32.lib ws2_32.lib kernel32.lib msvcrt.lib
1919
)
2020
set_property(TARGET client PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
2121
ENDIF(WIN32)
@@ -34,7 +34,7 @@ IF(WIN32)
3434
server
3535
debug "${CMAKE_SOURCE_DIR}/target/debug/rustls_ffi.lib"
3636
optimized "${CMAKE_SOURCE_DIR}/target/release/rustls_ffi.lib"
37-
advapi32.lib credui.lib kernel32.lib secur32.lib legacy_stdio_definitions.lib kernel32.lib advapi32.lib userenv.lib kernel32.lib kernel32.lib ws2_32.lib bcrypt.lib msvcrt.lib legacy_stdio_definitions.lib userenv.lib kernel32.lib msvcrt.lib ntdll.lib Synchronization.lib
37+
advapi32.lib bcrypt.lib crypt32.lib cryptnet.lib kernel32.lib ncrypt.lib bcrypt.lib advapi32.lib legacy_stdio_definitions.lib kernel32.lib advapi32.lib kernel32.lib ntdll.lib userenv.lib ws2_32.lib synchronization.lib kernel32.lib ws2_32.lib kernel32.lib msvcrt.lib
3838
)
3939
set_property(TARGET server PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
4040
ENDIF(WIN32)

tests/static_libs.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,25 @@ fn expected_linker_parts() -> &'static [&'static str] {
6060
#[cfg(target_os = "windows")]
6161
{
6262
&[
63+
"advapi32.lib",
64+
"bcrypt.lib",
65+
"crypt32.lib",
66+
"cryptnet.lib",
67+
"kernel32.lib",
68+
"ncrypt.lib",
6369
"bcrypt.lib",
6470
"advapi32.lib",
6571
"legacy_stdio_definitions.lib",
6672
"kernel32.lib",
6773
"advapi32.lib",
68-
"bcrypt.lib",
6974
"kernel32.lib",
7075
"ntdll.lib",
7176
"userenv.lib",
7277
"ws2_32.lib",
78+
"synchronization.lib",
7379
"kernel32.lib",
7480
"ws2_32.lib",
7581
"kernel32.lib",
76-
"ntdll.lib",
77-
"kernel32.lib",
7882
"msvcrt.lib",
7983
]
8084
}

0 commit comments

Comments
 (0)