From 5a513ecacd63a2510dbb65d445922615ccd8faf2 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Sat, 27 Apr 2024 16:51:51 +0100
Subject: [PATCH] Enable websockets on windows build

---
 .github/workflows/windows.yml | 2 +-
 installer/mosquitto64.nsi     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 962f9928..9cca7108 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -30,7 +30,7 @@ jobs:
           github-binarycache: true
 
       - name: Configure CMake
-        run: cmake -B ${{github.workspace}}/build64 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWITH_TESTS=OFF -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-release -DVCPKG_MANIFEST_MODE=ON
+        run: cmake -B ${{github.workspace}}/build64 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWITH_LIBWEBSOCKETS=ON -DWITH_TESTS=OFF -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-release -DVCPKG_MANIFEST_MODE=ON
       - name: Build
         run: cmake --build ${{github.workspace}}/build64 --config ${{env.BUILD_TYPE}}
 
diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi
index f6ab610c..45a05a7d 100644
--- a/installer/mosquitto64.nsi
+++ b/installer/mosquitto64.nsi
@@ -67,6 +67,9 @@ Section "Files" SecInstall
 	File "..\build64\vcpkg_installed\x64-windows-release\bin\libcrypto-3-x64.dll"
 	File "..\build64\vcpkg_installed\x64-windows-release\bin\libssl-3-x64.dll"
 	File "..\build64\vcpkg_installed\x64-windows-release\bin\pthreadVC3.dll"
+	File "..\build64\vcpkg_installed\x64-windows-release\bin\uv.dll"
+	File "..\build64\vcpkg_installed\x64-windows-release\bin\websockets.dll"
+	File "..\build64\vcpkg_installed\x64-windows-release\bin\zlib.dll"
 
 	SetOutPath "$INSTDIR\devel"
 	File "..\build64\lib\Release\mosquitto.lib"
@@ -129,6 +132,9 @@ Section "Uninstall"
 	Delete "$INSTDIR\libcrypto-3-x64.dll"
 	Delete "$INSTDIR\libssl-3-x64.dll"
 	Delete "$INSTDIR\pthreadVC3.dll"
+	Delete "$INSTDIR\uv.dll"
+	Delete "$INSTDIR\websockets.dll"
+	Delete "$INSTDIR\zlib.dll"
 
 	Delete "$INSTDIR\devel\mosquitto.h"
 	Delete "$INSTDIR\devel\mosquitto_broker.h"