rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Normalize cmake generator strings

This commit is contained in:
noisyshape 2019-04-11 11:42:59 -04:00 committed by GitHub
parent 3e6095fc34
commit 0af43a2488
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clean_build.bat
View File

@ -12,7 +12,7 @@ cd /d %~dp0
REM cmake generator name for the target build system REM cmake generator name for the target build system
if "%VisualStudioVersion%"=="15.0" ( if "%VisualStudioVersion%"=="15.0" (
set cmake_gen=Visual Studio 15 2017 Win64 set cmake_gen=Visual Studio 15 2017
) else if "%VisualStudioVersion%"=="16.0" ( ) else if "%VisualStudioVersion%"=="16.0" (
set cmake_gen=Visual Studio 16 2019 set cmake_gen=Visual Studio 16 2019
) else ( ) else (
@ -37,7 +37,7 @@ rmdir /q /s build
mkdir build mkdir build
if ERRORLEVEL 1 goto failed if ERRORLEVEL 1 goto failed
cd build 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 if ERRORLEVEL 1 goto failed
echo @msbuild barrier.sln /p:Platform="x64" /p:Configuration=%B_BUILD_TYPE% /m %B_BUILD_OPTIONS% > make.bat echo @msbuild barrier.sln /p:Platform="x64" /p:Configuration=%B_BUILD_TYPE% /m %B_BUILD_OPTIONS% > make.bat
call make.bat call make.bat