diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | ci/build.ps1 | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 848e100b02..43281dee2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,7 @@ endif() # Log level (MIN_LOG_LEVEL in log.h) 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() if(NOT MIN_LOG_LEVEL MATCHES "^[0-3]$") message(FATAL_ERROR "invalid MIN_LOG_LEVEL: " ${MIN_LOG_LEVEL}) diff --git a/appveyor.yml b/appveyor.yml index e27b8e1b88..0de9174adf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ configuration: - MINGW_64-gcov init: - 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)$') { $env:APPVEYOR_CACHE_SKIP_SAVE = "true" Exit-AppVeyorBuild diff --git a/ci/build.ps1 b/ci/build.ps1 index cbe300cc28..4c47ac1c51 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -1,11 +1,12 @@ $ErrorActionPreference = 'stop' Set-PSDebug -Strict -Trace 1 +$isPullRequest = ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -ne $null) $env:CONFIGURATION -match '^(?<compiler>\w+)_(?<bits>32|64)(?:-(?<option>\w+))?$' $compiler = $Matches.compiler $compileOption = $Matches.option $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)") $depsCmakeVars = @{ CMAKE_BUILD_TYPE = $cmakeBuildType; |