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
56e7bdf2
Commit
56e7bdf2
authored
Jul 08, 2019
by
Ben Bader
Committed by
Adam Cozzette
Jul 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix builtin_atomics check in CMakeLists.txt
parent
2d61b9ed
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
CMakeLists.txt
cmake/CMakeLists.txt
+3
-0
No files found.
cmake/CMakeLists.txt
View file @
56e7bdf2
...
...
@@ -137,6 +137,8 @@ endif (HAVE_ZLIB)
set
(
protobuf_LINK_LIBATOMIC false
)
if
(
NOT MSVC
)
include
(
CheckCXXSourceCompiles
)
set
(
OLD_CMAKE_REQUIRED_FLAGS
${
CMAKE_REQUIRED_FLAGS
}
)
set
(
CMAKE_REQUIRED_FLAGS
${
CMAKE_REQUIRED_FLAGS
}
-std=c++11
)
check_cxx_source_compiles
(
"
#include <atomic>
int main() {
...
...
@@ -146,6 +148,7 @@ if (NOT MSVC)
if
(
NOT protobuf_HAVE_BUILTIN_ATOMICS
)
set
(
protobuf_LINK_LIBATOMIC true
)
endif
(
NOT protobuf_HAVE_BUILTIN_ATOMICS
)
set
(
CMAKE_REQUIRED_FLAGS
${
OLD_CMAKE_REQUIRED_FLAGS
}
)
endif
(
NOT MSVC
)
if
(
protobuf_BUILD_SHARED_LIBS
)
...
...
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