diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2019-07-18 01:31:43 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2019-07-18 01:31:43 -0400 |
| commit | a916009d4b29995ea8ad61ad47a51c2ee1fa80bc (patch) | |
| tree | f53f459caa6868bda7c3f6dae0d8f30f19325af3 /clean_build.bat | |
| parent | 68a36b3b67ec82cdd3f77e88e40d1043cbab5000 (diff) | |
New upstream version 2.3.0+dfsgupstream/2.3.0+dfsg
Diffstat (limited to 'clean_build.bat')
| -rw-r--r-- | clean_build.bat | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/clean_build.bat b/clean_build.bat index b1f0410..e45f334 100644 --- a/clean_build.bat +++ b/clean_build.bat @@ -10,6 +10,18 @@ set B_BONJOUR=C:\Program Files\Bonjour SDK set savedir=%cd%
cd /d %~dp0
+REM cmake generator name for the target build system
+if "%VisualStudioVersion%"=="15.0" (
+ set cmake_gen=Visual Studio 15 2017
+) else if "%VisualStudioVersion%"=="16.0" (
+ set cmake_gen=Visual Studio 16 2019
+) else (
+ echo Visual Studio version was not detected.
+ echo Did you forget to run inside a VS developer prompt?
+ echo Using the default cmake generator.
+ set cmake_gen=Visual Studio 16 2019
+)
+
if exist build_env.bat call build_env.bat
REM needed by cmake to set bonjour include dir
@@ -25,7 +37,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%" -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
@@ -69,3 +81,4 @@ set B_BONJOUR= set BONJOUR_SDK_HOME=
set B_QT_FULLPATH=
set savedir=
+set cmake_gen=
|