Skip to content

Commit dd77904

Browse files
authored
Fix compilation on MSVC 2019 (#60)
This commit fixes the compilation on older MSVC 2019 (19.29) by converting two warnings that were treated as errors back to warnings. This problems doesn't occur on newer MSVC 2022 and probably is resolved on glog's `master` or in one of the maintained forks (`ng-log` or Abseil Logging). For `v1.2.0` we should probably update/change the dependency to one of those to stay with maintained dependencies.
1 parent b981622 commit dd77904

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [windows-2022, windows-latest]
21+
os: [windows-2019, windows-2022, windows-latest]
2222
build_type: [Release, Debug]
2323
name_suffix: [""]
2424
cmake_args: [""]

cmake/SetupCompileFlags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function(SETUP_COMPILE_FLAGS)
3030
endif()
3131
endif()
3232
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
33-
set(WARNINGS "/W4;/WX;/EHsc;/permissive-")
33+
set(WARNINGS "/W4;/WX;/EHsc;/permissive-;/W34996;/W4244")
3434
endif()
3535

3636
if(LIBBASE_BUILD_TESTS AND LIBBASE_CODE_COVERAGE)

0 commit comments

Comments
 (0)