From d021e600f04de2c5d87bb8b9773a2dfbf6c6c436 Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Wed, 7 Feb 2024 20:26:56 -0500 Subject: [PATCH] Be more explicit for now Signed-off-by: Geoff Hutchison --- .github/workflows/build_cmake.yml | 8 ++++---- cmake/AvogadroCPack.cmake | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 42c7900c..71428fdf 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -150,6 +150,10 @@ jobs: CC=${{matrix.config.cc}} CXX=${{matrix.config.cxx}} cmake $GITHUB_WORKSPACE ${{env.FEATURES}} -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} ${{matrix.config.cmake_flags}} shell: bash + - name: Setup tmate session + if: runner.os == 'Windows' + uses: mxschmitt/action-tmate@v3 + - name: Build run: | CC=${{matrix.config.cc}} CXX=${{matrix.config.cxx}} cmake --build . --config ${{matrix.config.build_type}} ${{matrix.config.build_flags}} @@ -285,10 +289,6 @@ jobs: CODESIGN_IDENTITY: ${{ secrets.CODESIGN_ID }} PRODUCT_BUNDLE_IDENTIFIER: cc.avogadro - - name: Setup tmate session - if: ${{ failure() }} - uses: mxschmitt/action-tmate@v3 - - name: Upload if: matrix.config.artifact != 0 uses: actions/upload-artifact@v4 diff --git a/cmake/AvogadroCPack.cmake b/cmake/AvogadroCPack.cmake index ab7cb956..704a5dcf 100644 --- a/cmake/AvogadroCPack.cmake +++ b/cmake/AvogadroCPack.cmake @@ -53,7 +53,8 @@ if(INSTALL_BUNDLE_FILES) # grab OpenSSL for Windows if(WIN32) - if(DEFINED ENV{OPENSSL_ROOT_DIR}) + if(EXISTS "D:/a/Tools/OpenSSL/Win_x64") + set(OPENSSL_ROOT_DIR "D:/a/Tools/OpenSSL/Win_x64") file(GLOB OPENSSL_DLL $ENV{OPENSSL_ROOT_DIR}/bin/*.dll) install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR}) endif()