Merge branch 'dev' into dev2
This commit is contained in:
@@ -7,9 +7,9 @@ trigger:
|
|||||||
branches:
|
branches:
|
||||||
include:
|
include:
|
||||||
- master
|
- master
|
||||||
- dev
|
|
||||||
- dev2
|
|
||||||
- dev3
|
- dev3
|
||||||
|
- dev2
|
||||||
|
- dev
|
||||||
tags:
|
tags:
|
||||||
include:
|
include:
|
||||||
- v*
|
- v*
|
||||||
@@ -34,6 +34,14 @@ jobs:
|
|||||||
BuildType: secure
|
BuildType: secure
|
||||||
cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON
|
cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON
|
||||||
MSBuildConfiguration: Release
|
MSBuildConfiguration: Release
|
||||||
|
Debug x86:
|
||||||
|
BuildType: debug
|
||||||
|
cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -A Win32
|
||||||
|
MSBuildConfiguration: Debug
|
||||||
|
Release x86:
|
||||||
|
BuildType: release
|
||||||
|
cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -A Win32
|
||||||
|
MSBuildConfiguration: Release
|
||||||
steps:
|
steps:
|
||||||
- task: CMake@1
|
- task: CMake@1
|
||||||
inputs:
|
inputs:
|
||||||
|
|||||||
Reference in New Issue
Block a user