More build tweaks

bigfug · Mar 8, 2024 · d0cb9a9 · d0cb9a9
1 parent f84c4b8
commit d0cb9a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git 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
@@ -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 )