Another try with OpenSSL packaging

Signed-off-by: Geoff Hutchison <[email protected]>
OpenChemistry · Feb 7, 2024 · 68c2153 · 68c2153
1 parent 871891b
commit 68c2153
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -53,7 +53,7 @@ jobs:
             build_type: "Release",
             cmake_flags: "-DOPENSSL_ROOT_DIR=D:\\a\\Tools\\OpenSSL\\Win_x64",
             build_flags: "-j 2",
-            cpack_flags: "-G NSIS",
+            cpack_flags: "-G NSIS -DOPENSSL_ROOT_DIR=D:\\a\\Tools\\OpenSSL\\Win_x64",
           }
         - {
             name: "Ubuntu Address Sanitizer", artifact: "",

diff --git a/avogadro/lastinstall/CMakeLists.txt b/avogadro/lastinstall/CMakeLists.txt
@@ -33,6 +33,14 @@ if((APPLE OR WIN32) AND NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8)
     set(dirs ${dirs} "${vtk_dlls_dir}")
   endif()
 
+  # grab OpenSSL for Windows
+  if(WIN32)
+    if (OPENSSL_ROOT_DIR)
+      file(GLOB OPENSSL_DLL ${OPENSSL_ROOT_DIR}/bin/*.dll)
+      install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR})
+    endif()
+  endif()
+
   set(plugins "")
   foreach(plugin ${AvogadroLibs_PLUGINS})
     get_property(location TARGET ${plugin} PROPERTY LOCATION)