Skip to content

Windows: Use ninja for build #3586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ralight wants to merge 3 commits into
base: master
Choose a base branch
from
+13 −7
Open

Windows: Use ninja for build #3586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b722c80
Windows: Use ninja for build
ralight May 3, 2026
14bd2b5
test
ralight May 3, 2026
0e6c925
installer
ralight May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,17 @@ jobs:
triplet: ${{ matrix.triplet }}
token: ${{ github.token }}

- name: Set up VS
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{ matrix.arch }}

- name: Configure CMake
run: |
cmake `
-G Ninja `
-B ${{github.workspace}}/${{ matrix.buildloc }} `
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
-DCMAKE_GENERATOR_PLATFORM=${{ matrix.platform }} `
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake `
-DHTTP_API_DIR="C:\\${{ matrix.programfiles }}\\Mosquitto\\dashboard" `
-DVCPKG_MANIFEST_MODE=ON `
Expand All @@ -80,6 +85,7 @@ jobs:
- name: Installer
uses: joncloud/makensis-action@v5.0
with:
arguments: "/V4"
script-file: ${{github.workspace}}/installer/${{ matrix.nsis }}

- name: Upload installer to artifacts
Expand Down
6 changes: 3 additions & 3 deletions installer/mosquitto.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ SectionEnd

Section "Visual Studio Runtime"
SetOutPath "$INSTDIR"
File "VC_redist.x86.exe"
ExecWait '"$INSTDIR\VC_redist.x86.exe" /quiet /norestart'
Delete "$INSTDIR\VC_redist.x86.exe"
File "vc_redist.x86.exe"
ExecWait '"$INSTDIR\vc_redist.x86.exe" /quiet /norestart'
Delete "$INSTDIR\vc_redist.x86.exe"
SectionEnd

Section "Service" SecService
Expand Down
6 changes: 3 additions & 3 deletions installer/mosquitto64.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ SectionEnd

Section "Visual Studio Runtime"
SetOutPath "$INSTDIR"
File "VC_redist.x64.exe"
ExecWait '"$INSTDIR\VC_redist.x64.exe" /quiet /norestart'
Delete "$INSTDIR\VC_redist.x64.exe"
File "vc_redist.x64.exe"
ExecWait '"$INSTDIR\vc_redist.x64.exe" /quiet /norestart'
Delete "$INSTDIR\vc_redist.x64.exe"
SectionEnd

Section "Service" SecService
Expand Down