fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 09:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing windows CMAKE CI (#4004)

Browse Source
This commit is contained in:
borgmanJeremy
2025-06-11 20:39:36 -05:00
committed by GitHub
parent 7e7cbfa4ea
commit 100bfc1300
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build_cmake.yml vendored
View File

@@ -95,7 +95,7 @@ jobs:
- { - {
name: "Windows 2022 MSVC", name: "Windows 2022 MSVC",
artifact: "Windows-MSVC.tar.xz", artifact: "Windows-MSVC.tar.xz",
os: windows-2025, os: windows-2022,
cc: "cl", cxx: "cl", cc: "cl", cxx: "cl",
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat" environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
} }
@@ -103,19 +103,25 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Fix Python path
shell: pwsh
run: |
Remove-Item "$env:LOCALAPPDATA\Microsoft\WindowsApps\python*.exe" -Force -ErrorAction SilentlyContinue
- name: Cache Qt - name: Cache Qt
id: cache-qt id: cache-qt
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ./build/Qt path: ./build/Qt/6.9.1
key: ${{ runner.os }}-QtCache key: ${{ runner.os }}-QtCache-6.9.1
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: 6.8.* version: 6.9.1
target: desktop target: desktop
dir: '${{ github.workspace }}/build/' dir: '${{ github.workspace }}/build/'
cached: ${{ steps.cache-qt.outputs.cache-hit }}
- name: Configure - name: Configure
working-directory: build working-directory: build

12
appveyor.yml
View File

@@ -1,21 +1,21 @@
image: image:
- Visual Studio 2019 - Visual Studio 2022
clone_folder: c:\projects\source clone_folder: c:\projects\source
environment: environment:
Qt5_INSTALL_DIR: 'C:\Qt\5.15.2\msvc2019_64' Qt6_INSTALL_DIR: 'C:\Qt\6.8.1\msvc2022_64'
PATH: '%Qt5_INSTALL_DIR%\bin;%PATH%' PATH: '%Qt6_INSTALL_DIR%\bin;%PATH%'
build_script: build_script:
- cmd: >- - cmd: >-
set QTDIR=%Qt5_INSTALL_DIR% set QTDIR=%Qt6_INSTALL_DIR%
set "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC" set "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC"
set "OPENSSL_ROOT_DIR=C:/OpenSSL-v111-Win64" set "OPENSSL_ROOT_DIR=C:/OpenSSL-v111-Win64"
cmake -S c:\projects\source -B build -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE:STRING=Release -DENABLE_OPENSSL=ON -DRUN_IN_PLACE=OFF cmake -S c:\projects\source -B build -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE:STRING=Release -DENABLE_OPENSSL=ON -DRUN_IN_PLACE=OFF
cmake --build build --parallel 2 --config "Release" cmake --build build --parallel 2 --config "Release"