github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

cmake: add *-ovpn3 presets

pull/506/head
Christopher Ng 2022-06-07 18:28:11 +01:00
parent 67ba437825
commit 338a1783ca
2 changed files with 130 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.github/workflows/msbuild.yml vendored
View File

@ -8,12 +8,19 @@ jobs:
matrix:
arch: [x86, x64, arm64]
ossl: [ossl1.1.1, ossl3]
ovpn3:
- preset: ""
name: ""
upload_name: ""
- preset: -ovpn3
name: " - ovpn3"
upload_name: "_ovpn3"
env:
# Indicates the location of the vcpkg as a Git submodule of the project repository.
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
name: 'msvc - ${{matrix.arch}} - ${{ matrix.ossl }}'
name: 'msvc - ${{matrix.arch}} - ${{ matrix.ossl }}${{ matrix.ovpn3.name }}'
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
@ -23,20 +30,20 @@ jobs:
uses: lukka/run-vcpkg@v10
with:
vcpkgGitCommitId: "a5d6d145164e82e67fbf91a4a30f98699d30de63"
appendedCacheKey: "${{ matrix.arch }} - ${{ matrix.ossl }}"
appendedCacheKey: "${{ matrix.arch }} - ${{ matrix.ossl }}${{ matrix.ovpn3.name }}"
- name: Run CMake consuming CMakePreset.json and vcpkg.json by mean of vcpkg.
uses: lukka/run-cmake@v10
with:
configurePreset: '${{ matrix.arch }}-release-${{ matrix.ossl }}'
buildPreset: '${{ matrix.arch }}-release-${{ matrix.ossl }}'
configurePreset: '${{ matrix.arch }}-release-${{ matrix.ossl }}${{ matrix.ovpn3.preset }}'
buildPreset: '${{ matrix.arch }}-release-${{ matrix.ossl }}${{ matrix.ovpn3.preset }}'
- uses: actions/upload-artifact@v3
with:
name: openvpn-gui_${{ matrix.arch }}_${{ matrix.ossl }}
name: openvpn-gui_${{ matrix.arch }}_${{ matrix.ossl }}${{ matrix.ovpn3.upload_name }}
path: |
out/build/${{ matrix.arch }}-release-${{ matrix.ossl }}/*.dll
out/build/${{ matrix.arch }}-release-${{ matrix.ossl }}/*.exe
out/build/${{ matrix.arch }}-release-${{ matrix.ossl }}${{ matrix.ovpn3.preset }}/*.dll
out/build/${{ matrix.arch }}-release-${{ matrix.ossl }}${{ matrix.ovpn3.preset }}/*.exe
mingw:
strategy:

116
CMakePresets.json
View File

@ -63,6 +63,13 @@
"CMAKE_BUILD_TYPE": "Release"
}
},
{
"name": "ovpn3",
"hidden": true,
"cacheVariables": {
"CLI_OVPN3": "ON"
}
},
{
"name": "x64-debug-ossl3",
"inherits": [ "base", "ossl3", "x64", "debug" ]
@ -110,6 +117,54 @@
{
"name": "x86-release-ossl1.1.1",
"inherits": [ "base", "ossl1.1.1", "x86", "release" ]
},
{
"name": "x64-debug-ossl3-ovpn3",
"inherits": [ "base", "ossl3", "x64", "debug", "ovpn3" ]
},
{
"name": "x64-debug-ossl1.1.1-ovpn3",
"inherits": [ "base", "ossl1.1.1", "x64", "debug", "ovpn3" ]
},
{
"name": "arm64-debug-ossl3-ovpn3",
"inherits": [ "base", "ossl3", "arm64", "debug", "ovpn3" ]
},
{
"name": "arm64-debug-ossl1.1.1-ovpn3",
"inherits": [ "base", "ossl1.1.1", "arm64", "debug", "ovpn3" ]
},
{
"name": "x86-debug-ossl3-ovpn3",
"inherits": [ "base", "ossl3", "x86", "debug", "ovpn3" ]
},
{
"name": "x86-debug-ossl1.1.1-ovpn3",
"inherits": [ "base", "ossl1.1.1", "x86", "debug", "ovpn3" ]
},
{
"name": "x64-release-ossl3-ovpn3",
"inherits": [ "base", "ossl3", "x64", "release", "ovpn3" ]
},
{
"name": "x64-release-ossl1.1.1-ovpn3",
"inherits": [ "base", "ossl1.1.1", "x64", "release", "ovpn3" ]
},
{
"name": "arm64-release-ossl3-ovpn3",
"inherits": [ "base", "ossl3", "arm64", "release", "ovpn3" ]
},
{
"name": "arm64-release-ossl1.1.1-ovpn3",
"inherits": [ "base", "ossl1.1.1", "arm64", "release", "ovpn3" ]
},
{
"name": "x86-release-ossl3-ovpn3",
"inherits": [ "base", "ossl3", "x86", "release", "ovpn3" ]
},
{
"name": "x86-release-ossl1.1.1-ovpn3",
"inherits": [ "base", "ossl1.1.1", "x86", "release", "ovpn3" ]
}
],
"buildPresets": [
@ -172,6 +227,67 @@
"name": "arm64-debug-ossl1.1.1",
"configurePreset": "arm64-debug-ossl1.1.1",
"configuration": "Debug"
},
{
"name": "x64-release-ossl3-ovpn3",
"configurePreset": "x64-release-ossl3-ovpn3",
"configuration": "Release"
},
{
"name": "x64-release-ossl1.1.1-ovpn3",
"configurePreset": "x64-release-ossl1.1.1-ovpn3",
"configuration": "Release"
},
{
"name": "x86-release-ossl3-ovpn3",
"configurePreset": "x86-release-ossl3-ovpn3",
"configuration": "Release"
},
{
"name": "x86-release-ossl1.1.1-ovpn3",
"configurePreset": "x86-release-ossl1.1.1-ovpn3",
"configuration": "Release"
},
{
"name": "arm64-release-ossl3-ovpn3",
"configurePreset": "arm64-release-ossl3-ovpn3",
"configuration": "Release"
},
{
"name": "arm64-release-ossl1.1.1-ovpn3",
"configurePreset": "arm64-release-ossl1.1.1-ovpn3",
"configuration": "Release"
},
{
"name": "x64-debug-ossl3-ovpn3",
"configurePreset": "x64-debug-ossl3-ovpn3",
"configuration": "Debug"
},
{
"name": "x64-debug-ossl1.1.1-ovpn3",
"configurePreset": "x64-debug-ossl1.1.1-ovpn3",
"configuration": "Debug"
},
{
"name": "x86-debug-ossl3-ovpn3",
"configurePreset": "x86-debug-ossl3-ovpn3",
"configuration": "Debug"
},
{
"name": "x86-debug-ossl1.1.1-ovpn3",
"configurePreset": "x86-debug-ossl1.1.1-ovpn3",
"configuration": "Debug"
},
{
"name": "arm64-debug-ossl3-ovpn3",
"configurePreset": "arm64-debug-ossl3-ovpn3",
"configuration": "Debug"
},
{
"name": "arm64-debug-ossl1.1.1-ovpn3",
"configurePreset": "arm64-debug-ossl1.1.1-ovpn3",
"configuration": "Debug"
}
]
}