aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Corentin Le Molgat <corentinl@google.com>2018-01-29 15:16:40 +0100
committerGravatar Corentin Le Molgat <corentinl@google.com>2018-02-01 20:31:36 +0100
commit8dd0f4e557b7f3c376841a09a0ab0fdd80672c13 (patch)
treef6023716ea4c41dcfab6be262e08faad0f520773
parentf7a05844eb39daaf057c4048e7acbe40a1c7e0da (diff)
Even with MSVC enable zlib support as default behaviour.
-rw-r--r--cmake/CMakeLists.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 2351392d..1578fb88 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -24,11 +24,7 @@ option(protobuf_BUILD_SHARED_LIBS "Build Shared Libraries" ${protobuf_BUILD_SHAR
include(CMakeDependentOption)
cmake_dependent_option(protobuf_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON
"NOT protobuf_BUILD_SHARED_LIBS" OFF)
-if (MSVC)
- set(protobuf_WITH_ZLIB_DEFAULT OFF)
-else (MSVC)
- set(protobuf_WITH_ZLIB_DEFAULT ON)
-endif (MSVC)
+set(protobuf_WITH_ZLIB_DEFAULT ON)
option(protobuf_WITH_ZLIB "Build with zlib support" ${protobuf_WITH_ZLIB_DEFAULT})
set(protobuf_DEBUG_POSTFIX "d"
CACHE STRING "Default debug postfix")