diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 09:40:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 09:40:39 +0200 |
| commit | df563e0c037f9b2cdb22e145575f92a121b4b529 (patch) | |
| tree | 31d39796cebcef916eb7e0888537c18f946170ff /cmake/os/Windows.cmake | |
| parent | e058a251c10350f3727ca1df022dc5786933535b (diff) | |
| parent | bdfe2784d5b73a1fdcdacb3d9adcc9dc71af344b (diff) | |
| download | mariadb-git-df563e0c037f9b2cdb22e145575f92a121b4b529.tar.gz | |
Merge 10.2 into 10.3
main.derived_cond_pushdown: Move all 10.3 tests to the end,
trim trailing white space, and add an "End of 10.3 tests" marker.
Add --sorted_result to tests where the ordering is not deterministic.
main.win_percentile: Add --sorted_result to tests where the
ordering is no longer deterministic.
Diffstat (limited to 'cmake/os/Windows.cmake')
| -rw-r--r-- | cmake/os/Windows.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 0caa67b20ab..d7e748a6d71 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -205,9 +205,8 @@ IF(MSVC) ENDIF() # Always link with socket library -LINK_LIBRARIES(ws2_32) -# ..also for tests -SET(CMAKE_REQUIRED_LIBRARIES ws2_32) +STRING(APPEND CMAKE_C_STANDARD_LIBRARIES " ws2_32.lib") +STRING(APPEND CMAKE_CXX_STANDARD_LIBRARIES " ws2_32.lib") # System checks SET(SIGNAL_WITH_VIO_CLOSE 1) # Something that runtime team needs |