diff --git a/CMakeLists.txt b/CMakeLists.txt
index 472bf2f8..ad1693f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,18 +11,13 @@ project(googletest-distribution)
 set(GOOGLETEST_VERSION 1.10.0)
 
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.1")
-    set(CMAKE_CXX_STANDARD 11)
-    set(CMAKE_CXX_STANDARD_REQUIRED OFF)
-endif()
-
-if(WIN32)
-  if(MSVC)
-    if(MSVC_TOOLSET_VERSION EQUAL 140 OR MSVC_TOOLSET_VERSION EQUAL 141)
-      # there is a bug reported on https://developercommunity.visualstudio.com/content/problem/9696/c17-not-available-by-default.html
-      # string_view is not available unless we use the /std:c++latest switch
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest")
+    if(NOT CYGWIN AND NOT MSYS)
+      set(CMAKE_CXX_EXTENSIONS OFF)
+      if(APPLE)
+        set(CMAKE_CXX_STANDARD 11)
+        set(CMAKE_CXX_STANDARD_REQUIRED OFF)
+      endif()
     endif()
-  endif()
 endif()
 
 enable_testing()