para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2025-03-21 13:04:19 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Manually suppress warnings for C++20 tests

Browse Source
This commit is contained in:
Dmitry Kobets 2021-11-30 12:57:37 -08:00
parent 1cae46b563
commit b7b1eaf9f2
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/CMakeLists.txt
View File

@ -15,7 +15,6 @@ endif()
pkg_search_module(GTestMain gtest_main) pkg_search_module(GTestMain gtest_main)
if (NOT GTestMain_FOUND) if (NOT GTestMain_FOUND)
message(INFO, "Manually building googletest")
# No pre-installed GTest is available, try to download it using Git. # No pre-installed GTest is available, try to download it using Git.
find_package(Git REQUIRED QUIET) find_package(Git REQUIRED QUIET)
@ -46,7 +45,6 @@ if (NOT GTestMain_FOUND)
${CMAKE_CURRENT_BINARY_DIR}/googletest-build ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
) )
message(INFO, "Done: Manually building googletest")
endif() endif()
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
@ -132,13 +130,14 @@ else()
-Wno-unused-member-function -Wno-unused-member-function
-Wno-unused-variable -Wno-unused-variable
> >
$<$<EQUAL:${CMAKE_CXX_STANDARD},20>:-Wzero-as-null-pointer-constant-> # Very noisy, minor, and just so
# happens to trigger on googletest
# for Ubuntu 20.04
$<$<EQUAL:${CMAKE_CXX_STANDARD},20>:-Wsign-conversion->
> >
$<$<CXX_COMPILER_ID:Clang>: $<$<CXX_COMPILER_ID:Clang>:
$<$<AND:$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,4.99>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,6>>: $<$<AND:$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,4.99>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,6>>:
$<$<EQUAL:${GSL_CXX_STANDARD},17>:-Wno-undefined-func-template> $<$<EQUAL:${GSL_CXX_STANDARD},17>:-Wno-undefined-func-template>
# $<$<EQUAL:${CMAKE_CXX_STANDARD},20>:-Wzero-as-null-pointer-constant-> # Very noisy, minor, and just so
# # happens to trigger on googletest
# # for Ubuntu 20.04
> >
> >
$<$<CXX_COMPILER_ID:AppleClang>: $<$<CXX_COMPILER_ID:AppleClang>:

1
tests/CMakeLists.txt.in
View File

@ -11,5 +11,4 @@ ExternalProject_Add(googletest
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""
CMAKE_ARGS -Wno-dev
) )