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
620bd741
Commit
620bd741
authored
Sep 15, 2015
by
Konstantin Podsvirov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename CMake option ZLIB to protobuf_WITH_ZLIB
parent
673d32e0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
CMakeLists.txt
cmake/CMakeLists.txt
+5
-5
No files found.
cmake/CMakeLists.txt
View file @
620bd741
...
...
@@ -13,11 +13,11 @@ option(protobuf_BUILD_TESTS "Build tests" ON)
option
(
BUILD_SHARED_LIBS
"Build Shared Libraries"
OFF
)
option
(
protobuf_MSVC_STATIC_RUNTIME
"Link static runtime libraries"
ON
)
if
(
MSVC
)
set
(
ZLIB_DEFAULT OFF
)
set
(
protobuf_WITH_
ZLIB_DEFAULT OFF
)
else
(
MSVC
)
set
(
ZLIB_DEFAULT ON
)
set
(
protobuf_WITH_
ZLIB_DEFAULT ON
)
endif
(
MSVC
)
option
(
ZLIB
"Build with zlib support"
${
ZLIB_DEFAULT
}
)
option
(
protobuf_WITH_ZLIB
"Build with zlib support"
${
protobuf_WITH_
ZLIB_DEFAULT
}
)
# Path to main configure script
set
(
protobuf_CONFIGURE_SCRIPT
"../configure.ac"
)
...
...
@@ -63,7 +63,7 @@ if (CMAKE_USE_PTHREADS_INIT)
add_definitions
(
-DHAVE_PTHREAD
)
endif
(
CMAKE_USE_PTHREADS_INIT
)
if
(
ZLIB
)
if
(
protobuf_WITH_
ZLIB
)
find_package
(
ZLIB
)
if
(
ZLIB_FOUND
)
set
(
HAVE_ZLIB 1
)
...
...
@@ -81,7 +81,7 @@ if (ZLIB)
set
(
ZLIB_INCLUDE_DIRECTORIES
)
set
(
ZLIB_LIBRARIES
)
endif
(
ZLIB_FOUND
)
endif
(
ZLIB
)
endif
(
protobuf_WITH_
ZLIB
)
if
(
HAVE_ZLIB
)
add_definitions
(
-DHAVE_ZLIB
)
...
...
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