From 47aac5081f7233bd9dcb3b4d5c066155a9d318c2 Mon Sep 17 00:00:00 2001 From: noisyshape <49459678+noisyshape@users.noreply.github.com> Date: Wed, 10 Apr 2019 14:08:09 -0400 Subject: [PATCH] Update Windows build script for VS2019 --- clean_build.bat | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/clean_build.bat b/clean_build.bat index b1f0410c..f0ef19c6 100644 --- a/clean_build.bat +++ b/clean_build.bat @@ -18,6 +18,9 @@ set BONJOUR_SDK_HOME=%B_BONJOUR% REM full path to Qt stuff we need set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC% +REM cmake generator name for the target build system +set cmake_gen=Visual Studio 16 2019 + echo Bonjour: %BONJOUR_SDK_HOME% echo Qt: %B_QT_FULLPATH% @@ -25,7 +28,7 @@ rmdir /q /s build mkdir build if ERRORLEVEL 1 goto failed cd build -cmake -G "Visual Studio 15 2017 Win64" -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% .. +cmake -G "%cmake_gen%" -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 @@ -69,3 +72,4 @@ set B_BONJOUR= set BONJOUR_SDK_HOME= set B_QT_FULLPATH= set savedir= +set cmake_gen=