Set different vs version for compiling and qt

Signed-off-by: Felix Weilbach <[email protected]>
dla-marbach · Sep 8, 2021 · 753f8bd · 753f8bd
1 parent 7d7afb8
commit 753f8bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/build.bat b/build.bat
@@ -27,6 +27,7 @@ call :testEnv PROJECT_PATH
 call :testEnv BUILD_TYPE
 call :testEnv BUILD_TARGETS
 call :testEnv QT_PATH
+call :testEnv QT_VS_VERSION
 call :testEnv OPENSSL_PATH
 call :testEnv Png2Ico_EXECUTABLE
 call :testEnv VS_VERSION
@@ -111,4 +112,4 @@ if "!%*!" == "" (
     echo "Missing environment variable: %*"
     exit /B 1
 )
-exit /B
+exit /B
diff --git a/common.inc.bat b/common.inc.bat
@@ -16,8 +16,8 @@ if	"%VS_VERSION%" == "2017"		set CMAKE_GENERATOR=Visual Studio 15 2017
 if	"%VS_VERSION%" == "2019"		set CMAKE_GENERATOR=Visual Studio 16 2019
 
 set CMAKE_GENERATOR_PLATFORM=x64								
-set QT_BIN_PATH=%QT_PATH%\msvc%VS_VERSION%_64\bin
-set QT_PREFIX=%QT_PATH%\msvc%VS_VERSION%_64
+set QT_BIN_PATH=%QT_PATH%\msvc%QT_VS_VERSION%_64\bin
+set QT_PREFIX=%QT_PATH%\msvc%QT_VS_VERSION%_64
 set QTKEYCHAIN_PREFIX=%PROJECT_PATH%/libs/%BUILD_TYPE%/qtkeychain/Win64
 
 if "%~2" == "Win32" (set BUILD_ARCH=%~2)
@@ -30,11 +30,11 @@ if "%BUILD_ARCH%" == "Win32" (
 		set CMAKE_GENERATOR=Visual Studio 16 2019
 	)
 	set CMAKE_GENERATOR_PLATFORM=Win32
-    set QT_BIN_PATH=%QT_PATH%\msvc%VS_VERSION%\bin
-	set QT_PREFIX=%QT_PATH%\msvc%VS_VERSION%
+    set QT_BIN_PATH=%QT_PATH%\msvc%QT_VS_VERSION%\bin
+	set QT_PREFIX=%QT_PATH%\msvc%QT_VS_VERSION%
 	set QTKEYCHAIN_PREFIX=%PROJECT_PATH%/libs/%BUILD_TYPE%/qtkeychain/Win32
 )
 
 set PATH=%QT_BIN_PATH%;%PATH%
 
-Rem ******************************************************************************************
+Rem ******************************************************************************************
diff --git a/defaults.inc.bat b/defaults.inc.bat
@@ -32,7 +32,9 @@ rem Comma separated list of build targets (default: Win64, Win32)
 if "%BUILD_TARGETS%" == ""                  set BUILD_TARGETS=Win64,Win32
 
 if "%PROJECT_PATH%" == ""                   set PROJECT_PATH=c:/Nextcloud/client-building
+
 if "%QT_PATH%" == ""                        set QT_PATH=d:/Qt/5.15.2
+if "%QT_VS_VERSION%" == ""                  set QT_VS_VERSION=2019
 
                                             set PATH=c:/Nextcloud/tools/cmake/bin;c:/Nextcloud/tools;C:/Program Files (x86)/NSIS;%PATH%