One more time...

Signed-off-by: Geoff Hutchison <[email protected]>
OpenChemistry · Feb 8, 2024 · 3900fc6 · 3900fc6
1 parent f7ca495
commit 3900fc6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -132,17 +132,19 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        cached: ${{ steps.cache-qt.outputs.cache-hit }}
+        aqtversion: '==3.1.*'
+        cache: true
         version: ${{ env.QT_VERSION }}
 
     - name: Install OpenSSL (Win64)
       if: runner.os == 'Windows'
       uses: jurplel/install-qt-action@v3
       with:
         aqtversion: '==3.1.*'
+        cache: true
         host: 'windows'
         target: 'desktop'
-        toolsOnly: 'true'
+        tools-only: 'true'
         tools: 'tools_opensslv3_x64'
 
     - name: Configure MSVC Command Prompt

diff --git a/avogadro/lastinstall/CMakeLists.txt b/avogadro/lastinstall/CMakeLists.txt
@@ -35,18 +35,9 @@ if((APPLE OR WIN32) AND NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8)
 
   # grab OpenSSL for Windows
   if(WIN32)
-    find_package(OpenSSL)
-    message(STATUS "FindSSL found: ${OPENSSL_FOUND}")
-    message(STATUS "FindSSL include dir: ${OPENSSL_INCLUDE_DIR}")
-    message(STATUS "FindSSL crypto lib: ${OPENSSL_CRYPTO_LIBRARY}")
-    message(STATUS "FindSSL Crypto dependencies: ${OPENSSL_CRYPTO_LIBRARIES}")
-    message(STATUS "FindSSL SSL lib: ${OPENSSL_SSL_LIBRARY}")
-    message(STATUS "FindSSL SSL dependencies: ${OPENSSL_SSL_LIBRARIES}")
-    message(STATUS "FindSSL ALL : ${OPENSSL_LIBRARIES}")
-    message(STATUS "OpenSSL root directory: ${OPENSSL_ROOT_DIR}")
-    message(STATUS "Environment OPENSSL_ROOT_DIR: $ENV{OPENSSL_ROOT_DIR}")
-    if (DEFINED OPENSSL_ROOT_DIR)
-      message(STATUS "OpenSSL root directory: ${OPENSSL_ROOT_DIR}")
+    if(EXISTS "${Qt5_Dir}/../../Tools/OpenSSLv3/Win_x64/")
+      set(OPENSSL_ROOT_DIR "${Qt5_Dir}/../../Tools/OpenSSLv3/Win_x64/")
+      message(STATUS "Using OpenSSL from ${OPENSSL_ROOT_DIR}")
       file(GLOB OPENSSL_DLL ${OPENSSL_ROOT_DIR}/bin/*.dll)
       install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR})
     endif()

diff --git a/cmake/AvogadroCPack.cmake b/cmake/AvogadroCPack.cmake
@@ -54,9 +54,9 @@ if(INSTALL_BUNDLE_FILES)
   # grab OpenSSL for Windows
   if(WIN32)
     if(EXISTS "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64/")
-      message(STATUS "Using OpenSSL from $ENV{OPENSSL_ROOT_DIR}")
       set(OPENSSL_ROOT_DIR "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64")
-      file(GLOB OPENSSL_DLL $ENV{OPENSSL_ROOT_DIR}/bin/*.dll)
+      message(STATUS "Using OpenSSL from ${OPENSSL_ROOT_DIR}")
+      file(GLOB OPENSSL_DLL ${OPENSSL_ROOT_DIR}/bin/*.dll)
       install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR})
     endif()
   endif()