Skip to content

P
protobuf
Commit f80a886b authored by Ivan Shynkarenka's avatar Ivan Shynkarenka
Browse files
Options

Cygwin build failed

parent 05c2d01b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
cmake/CMakeLists.txt
View file @ f80a886b
...@@ -16,9 +16,13 @@ endif() ...@@ -16,9 +16,13 @@ endif()
project(protobuf C CXX) project(protobuf C CXX)
# Add c++11 flags # 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 # Options
option(protobuf_BUILD_TESTS "Build tests" ON) option(protobuf_BUILD_TESTS "Build tests" ON)
...@@ -163,7 +167,7 @@ if (MSVC) ...@@ -163,7 +167,7 @@ if (MSVC)
string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR}) string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR})
string(REPLACE "/" "\\" PROTOBUF_BINARY_WIN32_PATH ${protobuf_BINARY_DIR}) string(REPLACE "/" "\\" PROTOBUF_BINARY_WIN32_PATH ${protobuf_BINARY_DIR})
configure_file(extract_includes.bat.in extract_includes.bat) configure_file(extract_includes.bat.in extract_includes.bat)
# Suppress linker warnings about files with no symbols defined. # Suppress linker warnings about files with no symbols defined.
set(CMAKE_STATIC_LINKER_FLAGS /ignore:4221) set(CMAKE_STATIC_LINKER_FLAGS /ignore:4221)
endif (MSVC) endif (MSVC)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment