ci/build.ps1: Respect CMAKE_BUILD_TYPE if provided #9869
This commit is contained in:
parent
d5fd0732e0
commit
ae2401621a
|
@ -159,7 +159,7 @@ endif()
|
||||||
|
|
||||||
# Log level (MIN_LOG_LEVEL in log.h)
|
# Log level (MIN_LOG_LEVEL in log.h)
|
||||||
if("${MIN_LOG_LEVEL}" MATCHES "^$")
|
if("${MIN_LOG_LEVEL}" MATCHES "^$")
|
||||||
message(STATUS "MIN_LOG_LEVEL not specified, default is 0 (DEBUG)")
|
message(STATUS "MIN_LOG_LEVEL not specified, default is 1 (INFO)")
|
||||||
else()
|
else()
|
||||||
if(NOT MIN_LOG_LEVEL MATCHES "^[0-3]$")
|
if(NOT MIN_LOG_LEVEL MATCHES "^[0-3]$")
|
||||||
message(FATAL_ERROR "invalid MIN_LOG_LEVEL: " ${MIN_LOG_LEVEL})
|
message(FATAL_ERROR "invalid MIN_LOG_LEVEL: " ${MIN_LOG_LEVEL})
|
||||||
|
|
|
@ -12,7 +12,7 @@ configuration:
|
||||||
- MINGW_64-gcov
|
- MINGW_64-gcov
|
||||||
init:
|
init:
|
||||||
- ps: |
|
- ps: |
|
||||||
# For pull requests, skip some build configurations to save time.
|
# Pull requests: skip some build configurations to save time.
|
||||||
if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and $env:CONFIGURATION -match '^(MSVC_64|MINGW_32|MINGW_64-gcov)$') {
|
if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and $env:CONFIGURATION -match '^(MSVC_64|MINGW_32|MINGW_64-gcov)$') {
|
||||||
$env:APPVEYOR_CACHE_SKIP_SAVE = "true"
|
$env:APPVEYOR_CACHE_SKIP_SAVE = "true"
|
||||||
Exit-AppVeyorBuild
|
Exit-AppVeyorBuild
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
$ErrorActionPreference = 'stop'
|
$ErrorActionPreference = 'stop'
|
||||||
Set-PSDebug -Strict -Trace 1
|
Set-PSDebug -Strict -Trace 1
|
||||||
|
|
||||||
|
$isPullRequest = ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -ne $null)
|
||||||
$env:CONFIGURATION -match '^(?<compiler>\w+)_(?<bits>32|64)(?:-(?<option>\w+))?$'
|
$env:CONFIGURATION -match '^(?<compiler>\w+)_(?<bits>32|64)(?:-(?<option>\w+))?$'
|
||||||
$compiler = $Matches.compiler
|
$compiler = $Matches.compiler
|
||||||
$compileOption = $Matches.option
|
$compileOption = $Matches.option
|
||||||
$bits = $Matches.bits
|
$bits = $Matches.bits
|
||||||
$cmakeBuildType = 'RelWithDebInfo'
|
$cmakeBuildType = $(if ($env:CMAKE_BUILD_TYPE -ne $null) {$env:CMAKE_BUILD_TYPE} else {'RelWithDebInfo'});
|
||||||
$buildDir = [System.IO.Path]::GetFullPath("$(pwd)")
|
$buildDir = [System.IO.Path]::GetFullPath("$(pwd)")
|
||||||
$depsCmakeVars = @{
|
$depsCmakeVars = @{
|
||||||
CMAKE_BUILD_TYPE = $cmakeBuildType;
|
CMAKE_BUILD_TYPE = $cmakeBuildType;
|
||||||
|
|
Loading…
Reference in New Issue