Fixup cpack options

Signed-off-by: Geoff Hutchison <[email protected]>
OpenChemistry · Feb 9, 2024 · 4c5aa4f · 4c5aa4f
1 parent bbf6598
commit 4c5aa4f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/avogadro/lastinstall/CMakeLists.txt b/avogadro/lastinstall/CMakeLists.txt
@@ -46,7 +46,7 @@ if((APPLE OR WIN32) AND NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8)
       file(GLOB OPENSSL_DLL ${OPENSSL_ROOT_DIR}/bin/*.dll)
       install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR})
     endif()
-endif()
+  endif()
 
   set(plugins "")
   foreach(plugin ${AvogadroLibs_PLUGINS})

diff --git a/cmake/AvogadroCPack.cmake b/cmake/AvogadroCPack.cmake
@@ -53,8 +53,16 @@ if(INSTALL_BUNDLE_FILES)
 
   # grab OpenSSL for Windows
   if(WIN32)
-    if(EXISTS "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64/")
+    if(EXISTS "${Qt5_Dir}/../../Tools/OpenSSLv3/Win_x64/")
+      set(OPENSSL_ROOT_DIR "${Qt5_Dir}/../../Tools/OpenSSLv3/Win_x64/")
+    elseif(DEFINED $ENV{OPENSSL_ROOT_DIR})
+      set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
+    elseif(EXISTS "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64/")
       set(OPENSSL_ROOT_DIR "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64")
+    elseif(EXISTS "D:/a/avogadrolibs/Qt/Tools/OpenSSLv3/Win_x64/")
+      set(OPENSSL_ROOT_DIR "D:/a/avogadrolibs/Qt/Tools/OpenSSLv3/Win_x64")
+    endif()
+    if (DEFINED OPENSSL_ROOT_DIR)
       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})