Skip to content

Commit 5e42f2a

Browse files
hebastohebasto
committed
build: Make <QtBaseDir> default name Qt and VS versions agnostic
This change allows users to not patch `common.qt.init.vcxproj` to fit their Qt and Visual Studio versions. Also it simplifies code base maintaining. To specify a non-default path, the QTBASEDIR environment variable can be used.
1 parent ecf580e commit 5e42f2a

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎.cirrus.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ task:
9292
QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.12/5.12.11/single/qt-everywhere-src-5.12.11.zip'
9393
QT_LOCAL_PATH: 'C:\qt-everywhere-src-5.12.11.zip'
9494
QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.12.11'
95-
QTBASEDIR: 'C:\Qt5.12.11_x64_static_vs2019_160900'
95+
QTBASEDIR: 'C:\Qt_static'
9696
x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
9797
IgnoreWarnIntDirInTempDetected: 'true'
9898
merge_script:

‎build_msvc/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The instructions below use `vcpkg` to install the dependencies.
5555
PS >py -3 msvc-autogen.py
5656
```
5757

58-
- An optional step is to adjust the settings in the `build_msvc` directory and the `common.init.vcxproj` file. This project file contains settings that are common to all projects such as the runtime library version and target Windows SDK version. The Qt directories can also be set.
58+
- An optional step is to adjust the settings in the `build_msvc` directory and the `common.init.vcxproj` file. This project file contains settings that are common to all projects such as the runtime library version and target Windows SDK version. The Qt directories can also be set. To specify a non-default path to a static Qt package directory, use the `QTBASEDIR` environment variable.
5959

6060
- To build from the command line with the Visual Studio 2019 toolchain use:
6161

‎build_msvc/common.qt.init.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<PropertyGroup Label="QtGlobals">
5-
<QtBaseDir>C:\Qt5.12.11_x64_static_vs2019_160900</QtBaseDir>
5+
<QtBaseDir Condition="'$(QTBASEDIR)' == ''">C:\Qt_static</QtBaseDir>
66
<QtPluginsLibraryDir>$(QtBaseDir)\plugins</QtPluginsLibraryDir>
77
<QtLibraryDir>$(QtBaseDir)\lib</QtLibraryDir>
88
<QtIncludeDir>$(QtBaseDir)\include</QtIncludeDir>

0 commit comments

Comments
 (0)