From f9c051fc8232ae44bc49538284a01f36820846b9 Mon Sep 17 00:00:00 2001
From: Povilas Kanapickas <povilas@radix.lt>
Date: Mon, 1 Nov 2021 04:28:12 +0200
Subject: [PATCH 1/2] Use cmake --build to build on Windows

---
 clean_build.bat | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/clean_build.bat b/clean_build.bat
index 79fce047..6f042326 100644
--- a/clean_build.bat
+++ b/clean_build.bat
@@ -41,8 +41,7 @@ if ERRORLEVEL 1 goto failed
 cd build
 cmake -G "%cmake_gen%" -A x64 -D CMAKE_BUILD_TYPE=%B_BUILD_TYPE% -D CMAKE_PREFIX_PATH="%B_QT_FULLPATH%" -D DNSSD_LIB="%B_BONJOUR%\Lib\x64\dnssd.lib" -D QT_VERSION=%B_QT_VER% ..
 if ERRORLEVEL 1 goto failed
-echo @msbuild barrier.sln /p:Platform="x64" /p:Configuration=%B_BUILD_TYPE% /m %B_BUILD_OPTIONS% > make.bat
-call make.bat
+cmake --build . --config %B_BUILD_TYPE%
 if ERRORLEVEL 1 goto failed
 if exist bin\Debug (
     copy %B_QT_FULLPATH%\bin\Qt5Cored.dll bin\Debug\ > NUL

From cb0480fe848242b6e282d956d8d49b1eb7b3318a Mon Sep 17 00:00:00 2001
From: Povilas Kanapickas <povilas@radix.lt>
Date: Mon, 1 Nov 2021 04:28:13 +0200
Subject: [PATCH 2/2] cmake: Silence tr1 deprecation warning on MSVC

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8653a2c8..86deb4b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,6 +293,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     add_definitions (
         /DSYSAPI_WIN32=1
         /DWINAPI_MSWINDOWS=1
+        /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1  # tr1 is used from gtest and gmock
         /DWIN32
         /D_WINDOWS
         /D_CRT_SECURE_NO_WARNINGS