Enable C++20 and re-enable MSVC build

Also switched to standard-conforming __VA_OPT__ for logging.
This commit is contained in:
Pengfei
2021-06-26 17:26:51 +08:00
parent e6d67f3aee
commit 3d3b51bb98
5 changed files with 19 additions and 11 deletions
+2 -2
View File
@@ -10,7 +10,7 @@ environment:
CHERE_INVOKING: 1
matrix:
- BUILD_TYPE: mingw
# - BUILD_TYPE: msvc
- BUILD_TYPE: msvc
platform:
- x64
@@ -37,7 +37,7 @@ before_build:
- ps: |
if ($env:BUILD_TYPE -eq 'msvc') {
# redirect stderr and change the exit code to prevent powershell from cancelling the build if cmake prints a warning
cmd /C 'cmake -G "Visual Studio 16 2019" -DUSE_BUNDLED_QT=OFF -DQt5_DIR=C:\Qt\5.14\msvc2017_64\lib\cmake\qt5 -DWARNINGS_AS_ERRORS=OFF - .. 2>&1 && exit 0'
cmd /C 'cmake -G "Visual Studio 16 2019" -DUSE_BUNDLED_QT=OFF -DQt5_DIR=C:\Qt\5.14\msvc2017_64\lib\cmake\qt5 -DWARNINGS_AS_ERRORS=OFF .. 2>&1 && exit 0'
} else {
C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=Release -DMINGW_STATIC_BUILD=ON -DCOMPILE_WITH_DWARF=OFF .. 2>&1"
}