Переглянути джерело

Rename CMake option ZLIB to protobuf_WITH_ZLIB

Konstantin Podsvirov 10 роки тому
батько
коміт
620bd7418d
1 змінених файлів з 5 додано та 5 видалено
  1. 5 5
      cmake/CMakeLists.txt

+ 5 - 5
cmake/CMakeLists.txt

@@ -13,11 +13,11 @@ option(protobuf_BUILD_TESTS "Build tests" ON)
 option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
 option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
 option(protobuf_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON)
 option(protobuf_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON)
 if (MSVC)
 if (MSVC)
-  set(ZLIB_DEFAULT OFF)
+  set(protobuf_WITH_ZLIB_DEFAULT OFF)
 else (MSVC)
 else (MSVC)
-  set(ZLIB_DEFAULT ON)
+  set(protobuf_WITH_ZLIB_DEFAULT ON)
 endif (MSVC)
 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
 # Path to main configure script
 set(protobuf_CONFIGURE_SCRIPT "../configure.ac")
 set(protobuf_CONFIGURE_SCRIPT "../configure.ac")
@@ -63,7 +63,7 @@ if (CMAKE_USE_PTHREADS_INIT)
   add_definitions(-DHAVE_PTHREAD)
   add_definitions(-DHAVE_PTHREAD)
 endif (CMAKE_USE_PTHREADS_INIT)
 endif (CMAKE_USE_PTHREADS_INIT)
 
 
-if (ZLIB)
+if (protobuf_WITH_ZLIB)
   find_package(ZLIB)
   find_package(ZLIB)
   if (ZLIB_FOUND)
   if (ZLIB_FOUND)
     set(HAVE_ZLIB 1)
     set(HAVE_ZLIB 1)
@@ -81,7 +81,7 @@ if (ZLIB)
     set(ZLIB_INCLUDE_DIRECTORIES)
     set(ZLIB_INCLUDE_DIRECTORIES)
     set(ZLIB_LIBRARIES)
     set(ZLIB_LIBRARIES)
   endif (ZLIB_FOUND)
   endif (ZLIB_FOUND)
-endif (ZLIB)
+endif (protobuf_WITH_ZLIB)
 
 
 if (HAVE_ZLIB)
 if (HAVE_ZLIB)
   add_definitions(-DHAVE_ZLIB)
   add_definitions(-DHAVE_ZLIB)