Merge pull request #4583 from chronoxor/master

Fix CMake build on Cygwin.

Merge pull request #4583 from chronoxor/master
Fix CMake build on Cygwin.
b0403a7d · Feng Xiao · GitHub · 05c2d01b · f80a886b · b0403a7d
Unverified Commit b0403a7d authored May 02, 2018 by Feng Xiao Committed by GitHub May 02, 2018
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

CMakeLists.txt cmake/CMakeLists.txt +7 -3

No files found.
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -16,9 +16,13 @@ endif()
 project(protobuf C CXX)
 # Add c++11 flags
-set(CMAKE_CXX_STANDARD 11)
+if (CYGWIN)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-set(CMAKE_CXX_EXTENSIONS OFF)
+else()
+  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_EXTENSIONS OFF)
+endif()
 # Options
 option(protobuf_BUILD_TESTS "Build tests" ON)