[gtest] Remove -Werror (#23780)

* [gtest] Remove -Werror

Fails to compile with latest clang

* Update version

* Fix lints in portfile.cmake/vcpkg.json

* Update version
This commit is contained in:
Eric Kilmer 2022-03-28 16:31:07 -04:00 committed by GitHub
parent fca3a520b9
commit 82e66412ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 9 deletions

View File

@ -10,22 +10,20 @@ vcpkg_from_github(
HEAD_REF main
PATCHES
fix-main-lib-path.patch
remove-werror.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT)
vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBUILD_GMOCK=ON
-DBUILD_GTEST=ON
-DCMAKE_DEBUG_POSTFIX=d
-Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT}
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/GTest TARGET_PATH share/GTest)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GTest)
file(
INSTALL

View File

@ -0,0 +1,20 @@
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
index 8d8d60a8..58fc9bfb 100644
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@@ -84,13 +84,13 @@ macro(config_compiler_and_linker)
# Ensure MSVC treats source files as UTF-8 encoded.
set(cxx_base_flags "${cxx_base_flags} -utf-8")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
+ set(cxx_base_flags "-Wall -Wshadow -Wconversion")
set(cxx_exception_flags "-fexceptions")
set(cxx_no_exception_flags "-fno-exceptions")
set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
set(cxx_no_rtti_flags "-fno-rtti")
elseif (CMAKE_COMPILER_IS_GNUCXX)
- set(cxx_base_flags "-Wall -Wshadow -Werror")
+ set(cxx_base_flags "-Wall -Wshadow")
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
endif()

View File

@ -1,7 +1,18 @@
{
"name": "gtest",
"version-semver": "1.11.0",
"port-version": 3,
"port-version": 4,
"description": "GoogleTest and GoogleMock testing frameworks",
"homepage": "https://github.com/google/googletest"
"homepage": "https://github.com/google/googletest",
"license": "BSD-3-Clause",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -2650,7 +2650,7 @@
},
"gtest": {
"baseline": "1.11.0",
"port-version": 3
"port-version": 4
},
"gtk": {
"baseline": "4.6.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9b9432e429e940c2d86eeef6fcf03bc74418c4c5",
"version-semver": "1.11.0",
"port-version": 4
},
{
"git-tree": "bc195b45d4d766498fb51de96427835c7c4d5748",
"version-semver": "1.11.0",