One more time with environment variables

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

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -53,7 +53,8 @@ jobs:
             build_type: "Release",
             cmake_flags: "-DOPENSSL_ROOT_DIR=D:\\a\\Tools\\OpenSSL\\Win_x64",
             build_flags: "-j 2",
-            cpack_flags: "-G NSIS -DOPENSSL_ROOT_DIR=D:\\a\\Tools\\OpenSSL\\Win_x64",
+            cpack_flags: "-G NSIS",
+            ssl_env: "D:\\a\\Tools\\OpenSSL\\Win_x64",
           }
         - {
             name: "Ubuntu Address Sanitizer", artifact: "",
@@ -236,10 +237,14 @@ jobs:
         if [ -z "${P12_PASSWORD}" ]; then
           unset CODESIGN_IDENTITY # to prevent cpack failing when trying to sign
         fi
+        if [ -z "${OPENSSL_ROOT_DIR}" ]; then
+          unset OPENSSL_ROOT_DIR
+        fi
         cpack ${{ matrix.config.cpack_flags }}
       env:
         P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
         CODESIGN_IDENTITY: ${{ secrets.CODESIGN_ID }}
+        OPENSSL_ROOT_DIR: ${{ matrix.config.ssl_env }}
       working-directory: ${{ runner.workspace }}/build/avogadroapp
 
     - name: AppImage

diff --git a/cmake/AvogadroCPack.cmake b/cmake/AvogadroCPack.cmake
@@ -53,8 +53,8 @@ if(INSTALL_BUNDLE_FILES)
 
   # grab OpenSSL for Windows
   if(WIN32)
-    if (OPENSSL_ROOT_DIR)
-      file(GLOB OPENSSL_DLL ${OPENSSL_ROOT_DIR}/bin/*.dll)
+    if(DEFINED ENV{OPENSSL_ROOT_DIR})
+      file(GLOB OPENSSL_DLL $ENV{OPENSSL_ROOT_DIR}/bin/*.dll)
       install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR})
     endif()
   endif()