diff options
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | test/stress/CMakeLists.txt | 1 |
2 files changed, 4 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 895e6b0..f2542cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,24 +17,15 @@ endif() add_compile_definitions(WIN32_LEAN_AND_MEAN NOMINMAX) -# AppVeyor builds w/ Visual Studio 2017 bombard me with stupid warnings otherwise: -if(MSVC_VERSION GREATER_EQUAL "1910" AND MSVC_VERSION LESS "1920") - add_definitions(/D_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING) -endif() - -# AppVeyor builds complain about _WIN32_WINNT not being defined. -# Not sure what's the right thing to do about it, arbitrarily setting it to -# target Windows 7 as described here: +# Fix this warning: +# +# Please define _WIN32_WINNT or _WIN32_WINDOWS appropriately. +# # https://docs.microsoft.com/en-gb/windows/win32/winprog/using-the-windows-headers if(WIN32) add_definitions(/DNTDDI_VERSION=NTDDI_WIN7 /D_WIN32_WINNT=_WIN32_WINNT_WIN7) endif() -# Silence deprecation warnings in Boost.Asio: -if(WIN32) - add_definitions(/D_WINSOCK_DEPRECATED_NO_WARNINGS) -endif() - add_subdirectory(client) add_subdirectory(server) diff --git a/test/stress/CMakeLists.txt b/test/stress/CMakeLists.txt index d73c65d..340cb12 100644 --- a/test/stress/CMakeLists.txt +++ b/test/stress/CMakeLists.txt @@ -1,7 +1,6 @@ if(CMAKE_HOST_UNIX) # Not going to bother with bash on Windows. - # stress_test.py is a Python 3 script. find_package(Python3 REQUIRED COMPONENTS Interpreter) add_test(NAME stress_test COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test.sh" "$<TARGET_FILE:server>" "$<TARGET_FILE:client>") endif() |