diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-12-16 18:40:54 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2021-12-16 18:47:18 -0800 |
| commit | 07c4059277c75e72ddfb558c371f89e67c30014e (patch) | |
| tree | 50673e9d3e63a26a1ae34ddf9828bd370802c709 /.gitlab-ci.yml | |
| parent | 7d88f1e2b17a6f02ec5ea929d400b0d863f51e4a (diff) | |
GitLab CI+Qt+Docs: CMAKE_PREFIX_PATH updates.
Qt's documentation recommends using CMAKE_PREFIX_PATH to designate your
Qt installation prefix: https://doc.qt.io/qt-5/cmake-get-started.html.
Do so in GitLab's CI and update the Developer's Guide.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b608e898ca..c690a268b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,7 +160,7 @@ variables: - $env:WIRESHARK_BASE_DIR = "C:\Development" - $env:Configuration = "RelWithDebInfo" - $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin" - - $env:CMAKE_PREFIX_PATH = "C:\qt\5.15.2\msvc2019_64\lib\cmake" + - $env:CMAKE_PREFIX_PATH = "C:\qt\5.15.2\msvc2019_64" # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell - cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt" - Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } } @@ -312,7 +312,6 @@ Win64 Package: - $env:WIRESHARK_BASE_DIR = "C:\Development" - $env:Configuration = "RelWithDebInfo" - $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin" - - $env:Path += ";C:\qt\5.15.2\msvc2019_64\bin" - $env:Path += ";C:\Program Files (x86)\NSIS" - $env:Path += ";C:\Program Files (x86)\WiX Toolset v3.11\bin" - $env:Path += ";C:\Program Files\Amazon\AWSCLIV2" @@ -358,10 +357,10 @@ Win32 Package: - $env:WIRESHARK_BASE_DIR = "C:\Development" - $env:Configuration = "RelWithDebInfo" - $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin" - - $env:Path += ";C:\qt\5.15.2\msvc2019\bin" - $env:Path += ";C:\Program Files (x86)\NSIS" - $env:Path += ";C:\Program Files (x86)\WiX Toolset v3.11\bin" - $env:Path += ";C:\Program Files\Amazon\AWSCLIV2" + - $env:CMAKE_PREFIX_PATH = "C:\qt\5.15.2\msvc2019" # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell - cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsamd64_x86.bat`" && set > %temp%\vcvars.txt" - Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } } @@ -436,7 +435,7 @@ macOS Intel Package: - wireshark-macos-intel-package retry: 1 script: - - export CMAKE_PREFIX_PATH=/usr/local/Qt-5.15.3/lib/cmake + - export CMAKE_PREFIX_PATH=/usr/local/Qt-5.15.3 - export PATH="$PATH:$HOME/bin" - perl tools/make-version.pl --set-release - mkdir build |