zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove -WX to prevent compilation errors for users when a symbol becomes deprecated

Browse Source 
Fixes: #5048
PiperOrigin-RevId: 960463020
Change-Id: I88690156683c995735c1c7495addab67a66b7877
This commit is contained in:
Abseil Team
2026-08-06 13:13:43 -07:00
committed by Copybara-Service
parent 4f472747b1
commit 4cb0ab12a1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/windows-presubmit.bat
+2
View File
@@ -19,6 +19,7 @@ IF %errorlevel% neq 0 EXIT /B 1
SET CMAKE_BUILD_PATH=cmake_msvc2022 SET CMAKE_BUILD_PATH=cmake_msvc2022
MKDIR %CMAKE_BUILD_PATH% MKDIR %CMAKE_BUILD_PATH%
CD %CMAKE_BUILD_PATH% CD %CMAKE_BUILD_PATH%
SET CXXFLAGS="/WX"
%CMAKE_BIN% %GTEST_ROOT% ^ %CMAKE_BIN% %GTEST_ROOT% ^
-G "Visual Studio 17 2022" ^ -G "Visual Studio 17 2022" ^
@@ -37,6 +38,7 @@ IF %errorlevel% neq 0 EXIT /B 1
%CTEST_BIN% -C Debug --timeout 600 %CTEST_BIN% -C Debug --timeout 600
IF %errorlevel% neq 0 EXIT /B 1 IF %errorlevel% neq 0 EXIT /B 1
SET "CXXFLAGS="
CD %GTEST_ROOT% CD %GTEST_ROOT%
RMDIR /S /Q %CMAKE_BUILD_PATH% RMDIR /S /Q %CMAKE_BUILD_PATH%
googletest/cmake/internal_utils.cmake
+1 -1
View File
@@ -77,7 +77,7 @@ macro(config_compiler_and_linker)
# Newlines inside flags variables break CMake's NMake generator. # Newlines inside flags variables break CMake's NMake generator.
# TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds. # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J") set(cxx_base_flags "-GS -W4 -wd4251 -wd4275 -nologo -J")
set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")