summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Soffer <asoffer@google.com>2020-01-02 16:49:30 -0500
committerAndy Soffer <asoffer@google.com>2020-01-02 16:49:30 -0500
commit07ab939af757a4dd2b4506653b025db42419fcd9 (patch)
tree606f30f9f1e0199a529aad36d643eb87a0feaf67
parent0d98d87e106919ad9216f1db430c452d95fb6f09 (diff)
parent20b8e7a1c8278c4270705e5648739148a22661d0 (diff)
downloadgoogletest-07ab939af757a4dd2b4506653b025db42419fcd9.tar.gz
googletest-07ab939af757a4dd2b4506653b025db42419fcd9.zip
Merge pull request #2632 from Kravlalala:cmake/mingw_msys_build
PiperOrigin-RevId: 287587126
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f11bbb52..755b8b72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ if (CMAKE_VERSION VERSION_LESS "3.1")
else()
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
- if(NOT CYGWIN)
+ if(NOT CYGWIN AND NOT MSYS)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
endif()
OpenPOWER on IntegriCloud