AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-09-18 01:33:00 +03:00
Code Releases Activity

Azure Pipelines: use "clang-cl" for Windows builds

Browse Source 
Now that we can successfully compile with Clang, there's probably no reason to stick with MSVC.
This commit is contained in:
Davide Beatrici 2020-08-16 02:15:25 +02:00
parent 7edda54b9a
commit a8fdc1184a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/azure-pipelines-win-steps.yml
View File

@ -1,6 +1,8 @@
parameters: parameters:
- name: architecture - name: architecture
type: string type: string
- name: compilerPath
type: string
- name: vcpkgTriplet - name: vcpkgTriplet
type: string type: string
- name: vcvarsPath - name: vcvarsPath
@ -18,7 +20,7 @@ steps:
displayName: 'Prepare environment' displayName: 'Prepare environment'
- script: | - script: |
call "${{parameters.vcvarsPath}}" call "${{parameters.vcvarsPath}}"
cmake -G "Ninja" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=${{parameters.vcpkgTriplet}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl $(Build.SourcesDirectory) cmake -G "Ninja" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=${{parameters.vcpkgTriplet}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER="${{parameters.compilerPath}}" -DCMAKE_CXX_COMPILER="${{parameters.compilerPath}}" $(Build.SourcesDirectory)
cmake --build . cmake --build .
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
displayName: 'Build' displayName: 'Build'

2
.ci/azure-pipelines-win.yml
View File

@ -7,6 +7,7 @@ jobs:
- template: "azure-pipelines-win-steps.yml" - template: "azure-pipelines-win-steps.yml"
parameters: parameters:
architecture: "x86_64" architecture: "x86_64"
compilerPath: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/Llvm/x64/bin/clang-cl.exe"
vcpkgTriplet: "x64-windows-static-md" vcpkgTriplet: "x64-windows-static-md"
vcvarsPath: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat" vcvarsPath: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
- job: windows_x86 - job: windows_x86
@ -17,5 +18,6 @@ jobs:
- template: "azure-pipelines-win-steps.yml" - template: "azure-pipelines-win-steps.yml"
parameters: parameters:
architecture: "x86" architecture: "x86"
compilerPath: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe"
vcpkgTriplet: "x86-windows-static-md" vcpkgTriplet: "x86-windows-static-md"
vcvarsPath: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvarsamd64_x86.bat" vcvarsPath: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvarsamd64_x86.bat"