From d0cb9a9ec0383e9a883bdcf626bb4d9cd3d31cdf Mon Sep 17 00:00:00 2001
From: Alex May <bigfug@gmail.com>
Date: Fri, 8 Mar 2024 15:42:00 +0000
Subject: [PATCH] More build tweaks

---
 .github/workflows/cmake-build.yml |  1 +
 CMakeLists.txt                    | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
index 04c81f7c..f3e46195 100644
--- a/.github/workflows/cmake-build.yml
+++ b/.github/workflows/cmake-build.yml
@@ -75,6 +75,7 @@ jobs:
         aqtversion: '==3.1.*'
         version: '6.6.2'
         modules: 'qt5compat qtimageformats qtmultimedia qtserialport qtwebsockets'
+        tools: 'tools_openssl'
         host: ${{ matrix.qt_host }}
         target: 'desktop'
         arch: ${{ matrix.qt_arch }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9419e83d..3e695621 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,7 +111,17 @@ install( DIRECTORY share/ DESTINATION ${PATH_SHARE}
 
 #------------------------------------------------------------------------------
 
-set( OPENSSL_ROOT_DIR "C:/Program Files/OpenSSL" CACHE PATH "Path to OpenSSL" )
+get_filename_component( QT_BASE "${QT_DIR}/../../../../../" ABSOLUTE )
+
+message( "QT_BASE=${QT_BASE}" )
+
+set( OPENSSL_ROOT_DIR "" CACHE PATH "Path to OpenSSL" )
+
+if( WIN32 )
+    if (Qt6_FOUND)
+        set( OPENSSL_ROOT_DIR "${QT_BASE}/tools/OpenSSLv3/Win_x64" CACHE PATH "Path to OpenSSL" )
+    endif()
+endif()
 
 find_package( OpenSSL )