Skip to content

Commit

Permalink
This time with the right path
Browse files Browse the repository at this point in the history
Signed-off-by: Geoff Hutchison <[email protected]>
  • Loading branch information
ghutchis committed Feb 8, 2024
1 parent b584248 commit f7ca495
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ jobs:
os: windows-latest,
cc: "cl", cxx: "cl",
build_type: "Release",
cmake_flags: "-DOPENSSL_ROOT_DIR=D:\\a\\Tools\\OpenSSL\\Win_x64",
cmake_flags: "",
build_flags: "-j 2",
cpack_flags: "-G NSIS",
ssl_env: "D:\\a\\Tools\\OpenSSL\\Win_x64",
ssl_env: "D:\\a\\avogadroapp\\Qt\\Tools\\OpenSSLv3\\Win_x64",
}
- {
name: "Ubuntu Address Sanitizer", artifact: "",
Expand Down Expand Up @@ -160,16 +160,16 @@ 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}}
shell: bash
working-directory: ${{ runner.workspace }}/build

- name: Setup tmate session
if: failure()
uses: mxschmitt/action-tmate@v3

- name: Fix Mac plugins
if: runner.os == 'macOS'
working-directory: ${{ runner.workspace }}/build/prefix/lib/openbabel
Expand Down
4 changes: 2 additions & 2 deletions cmake/AvogadroCPack.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ if(INSTALL_BUNDLE_FILES)

# grab OpenSSL for Windows
if(WIN32)
if(EXISTS "D:/a/Tools/OpenSSL/Win_x64")
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/Tools/OpenSSL/Win_x64")
set(OPENSSL_ROOT_DIR "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64")
file(GLOB OPENSSL_DLL $ENV{OPENSSL_ROOT_DIR}/bin/*.dll)
install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR})
endif()
Expand Down

0 comments on commit f7ca495

Please sign in to comment.