From 0af43a24884791167ef2009e73dfd760a7a9722a Mon Sep 17 00:00:00 2001 From: noisyshape <49459678+noisyshape@users.noreply.github.com> Date: Thu, 11 Apr 2019 11:42:59 -0400 Subject: [PATCH] Normalize cmake generator strings --- clean_build.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clean_build.bat b/clean_build.bat index b6a1b04c..e45f334b 100644 --- a/clean_build.bat +++ b/clean_build.bat @@ -12,7 +12,7 @@ cd /d %~dp0 REM cmake generator name for the target build system if "%VisualStudioVersion%"=="15.0" ( - set cmake_gen=Visual Studio 15 2017 Win64 + set cmake_gen=Visual Studio 15 2017 ) else if "%VisualStudioVersion%"=="16.0" ( set cmake_gen=Visual Studio 16 2019 ) else ( @@ -37,7 +37,7 @@ rmdir /q /s build mkdir build if ERRORLEVEL 1 goto failed cd build -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% .. +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