Skip to content

Commit

Permalink
#65 WIP OpenSSLv3
Browse files Browse the repository at this point in the history
AlexandrePTJ committed May 4, 2023
1 parent 221e181 commit cca15c4
Showing 3 changed files with 12 additions and 15 deletions.
21 changes: 9 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -12,10 +12,11 @@ jobs:
qt_version: [6.5.0, 5.15.2]
include:
- os: windows-2022
qt_tools: 'tools_openssl_x64'
qt_tools: 'tools_opensslv3_x64'
cmake_preset: 'release-win'
artifact_path: 'cmake-build-release-win/Kemai-*.msi'
- os: ubuntu-22.04
qt_tools: 'tools_opensslv3_src'
cmake_preset: 'release'
artifact_path: 'cmake-build-release/Kemai-*.AppImage'
- os: macos-13
@@ -49,7 +50,13 @@ jobs:
# OS dependencies
- if: contains(matrix.os, 'ubuntu')
name: Install Linux dev dependencies
run: sudo apt install libxss-dev libxkbcommon-x11-dev libxcb-cursor-dev
run: sudo apt install libxss-dev libxkbcommon-x11-dev libxcb-cursor0

- if: contains(matrix.os, 'ubuntu')
name: Build OpenSSLv3
run: |
cd ${{ github.workspace }}/Qt/Tools/OpenSSLv3/src
./Configure && make -j3
# Build
- name: Configure
@@ -90,13 +97,3 @@ jobs:
allowUpdates: true
draft: true
artifacts: ${{ matrix.artifact_path }}
#
# # Update packages on continuous 'release'
# - if: startsWith(matrix.qt_version, '6') && github.ref_name == 'develop'
# name: Create/Update Continuous
# uses: ncipollo/release-action@v1
# with:
# allowUpdates: true
# tag: Continuous
# name: Continuous
# artifacts: ${{ matrix.artifact_path }}
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
"hidden": true,
"cacheVariables": {
"CMAKE_PREFIX_PATH": "c:/Qt/6.5.0/msvc2019_64",
"OPENSSL_ROOT": "c:/Qt/Tools/OpenSSL/Win_x64",
"OPENSSL_ROOT": "c:/Qt/Tools/OpenSSLv3/Win_x64",
"CMAKE_INSTALL_PREFIX": "dist"
}
},
4 changes: 2 additions & 2 deletions cmake/WinDeployOpenSSL.cmake
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ function(kemai_find_openssl directory)
message("Looking for OpenSSL in ${directory}")

find_file(_WINDEPLOYOPENSSL_CRYPTO
NAMES libcrypto-1_1-x64.dll
NAMES libcrypto-3-x64.dll
PATHS ${directory} ${directory}/bin
NO_DEFAULT_PATH)
find_file(_WINDEPLOYOPENSSL_SSL
NAMES libssl-1_1-x64.dll
NAMES libssl-3-x64.dll
PATHS ${directory} ${directory}/bin
NO_DEFAULT_PATH)

0 comments on commit cca15c4

Please sign in to comment.