diff options
| author | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2015-09-15 15:31:25 +0300 |
|---|---|---|
| committer | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2015-09-15 15:31:25 +0300 |
| commit | 620bd7418d5ae0ac275e04ab216449a64e2cdc9d (patch) | |
| tree | 92f71430454180147e58aa29d1d61f7147a26784 /cmake/CMakeLists.txt | |
| parent | 673d32e0930bd87536da71b3bf1d0c6c3d098833 (diff) | |
| download | protobuf-620bd7418d5ae0ac275e04ab216449a64e2cdc9d.tar.gz protobuf-620bd7418d5ae0ac275e04ab216449a64e2cdc9d.tar.bz2 protobuf-620bd7418d5ae0ac275e04ab216449a64e2cdc9d.zip | |
Rename CMake option ZLIB to protobuf_WITH_ZLIB
Diffstat (limited to 'cmake/CMakeLists.txt')
| -rw-r--r-- | cmake/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 50e60f34..474bfd0f 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -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) |