Skip to content

Commit

Permalink
Fix C++17 builds:
Browse files Browse the repository at this point in the history
- Fix C++17 Visual Studio builds.
- Use C++17 for `windows-2019` builds.
- Removed options for unsupported compiler (MSVC11).
- Removed options, not needed after enabling C++11+ features in gmock/gtest.
  • Loading branch information
phprus committed Mar 26, 2021
1 parent 9cb347b commit bf4383e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- os: windows-2016
standard: 11
- os: windows-2019
standard: 14
standard: 17
- os: windows-2016
platform: Win32
build_type: Debug
Expand Down
10 changes: 1 addition & 9 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ else ()
target_compile_definitions(gmock PUBLIC GTEST_HAS_PTHREAD=0)
endif ()

target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=0)
target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=1)

if (MSVC)
# Workaround a bug in implementation of variadic templates in MSVC11.
target_compile_definitions(gmock PUBLIC _VARIADIC_MAX=10)

# Disable MSVC warnings of _CRT_INSECURE_DEPRECATE functions.
target_compile_definitions(gmock PRIVATE _CRT_SECURE_NO_WARNINGS)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Expand All @@ -31,11 +28,6 @@ if (MSVC)
endif ()
endif ()

# GTest doesn't detect <tuple> with clang.
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_definitions(gmock PUBLIC GTEST_USE_OWN_TR1_TUPLE=1)
endif ()

# Silence MSVC tr1 deprecation warning in gmock.
target_compile_definitions(gmock
PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1)
Expand Down

0 comments on commit bf4383e

Please sign in to comment.