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
0a22fe59
Commit
0a22fe59
authored
Sep 15, 2015
by
Konstantin Podsvirov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBS
parent
620bd741
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
CMakeLists.txt
cmake/CMakeLists.txt
+4
-4
No files found.
cmake/CMakeLists.txt
View file @
0a22fe59
...
...
@@ -10,7 +10,7 @@ cmake_policy(SET CMP0022 NEW)
# Options
option
(
protobuf_VERBOSE
"Enable for verbose output"
OFF
)
option
(
protobuf_BUILD_TESTS
"Build tests"
ON
)
option
(
BUILD_SHARED_LIBS
"Build Shared Libraries"
OFF
)
option
(
protobuf_
BUILD_SHARED_LIBS
"Build Shared Libraries"
OFF
)
option
(
protobuf_MSVC_STATIC_RUNTIME
"Link static runtime libraries"
ON
)
if
(
MSVC
)
set
(
protobuf_WITH_ZLIB_DEFAULT OFF
)
...
...
@@ -88,9 +88,9 @@ if (HAVE_ZLIB)
endif
(
HAVE_ZLIB
)
if
(
MSVC
)
if
(
BUILD_SHARED_LIBS
)
if
(
protobuf_
BUILD_SHARED_LIBS
)
add_definitions
(
-DPROTOBUF_USE_DLLS
)
else
(
BUILD_SHARED_LIBS
)
else
(
protobuf_
BUILD_SHARED_LIBS
)
# In case we are building static libraries, link also the runtime library statically
# so that MSVCR*.DLL is not required at runtime.
# https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
...
...
@@ -105,7 +105,7 @@ if (MSVC)
endif
(
${
flag_var
}
MATCHES
"/MD"
)
endforeach
(
flag_var
)
endif
(
protobuf_MSVC_STATIC_RUNTIME
)
endif
(
BUILD_SHARED_LIBS
)
endif
(
protobuf_
BUILD_SHARED_LIBS
)
add_definitions
(
/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305
)
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