Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
b0403a7d
Unverified
Commit
b0403a7d
authored
May 02, 2018
by
Feng Xiao
Committed by
GitHub
May 02, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4583 from chronoxor/master
Fix CMake build on Cygwin.
parents
05c2d01b
f80a886b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
CMakeLists.txt
cmake/CMakeLists.txt
+8
-4
No files found.
cmake/CMakeLists.txt
View file @
b0403a7d
...
...
@@ -16,9 +16,13 @@ endif()
project
(
protobuf C CXX
)
# Add c++11 flags
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD_REQUIRED ON
)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
if
(
CYGWIN
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=gnu++11"
)
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
)
...
...
@@ -163,7 +167,7 @@ if (MSVC)
string
(
REPLACE
"/"
"
\\
"
PROTOBUF_SOURCE_WIN32_PATH
${
protobuf_SOURCE_DIR
}
)
string
(
REPLACE
"/"
"
\\
"
PROTOBUF_BINARY_WIN32_PATH
${
protobuf_BINARY_DIR
}
)
configure_file
(
extract_includes.bat.in extract_includes.bat
)
# Suppress linker warnings about files with no symbols defined.
set
(
CMAKE_STATIC_LINKER_FLAGS /ignore:4221
)
endif
(
MSVC
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment