diff options
| author | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:54:31 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:54:31 -0700 |
| commit | afe96b6d4235b9d9fbfce2465f5c6d82c2611f48 (patch) | |
| tree | d509cb3cc3f2b25b58a75563758d2092103ca19a /cmake | |
| parent | 0400cca3236de1ca303af38bf81eab332d042b7c (diff) | |
| parent | 89b5333ad0f10058d5af62701c5ebea0db376c5b (diff) | |
| download | protobuf-afe96b6d4235b9d9fbfce2465f5c6d82c2611f48.tar.gz protobuf-afe96b6d4235b9d9fbfce2465f5c6d82c2611f48.tar.bz2 protobuf-afe96b6d4235b9d9fbfce2465f5c6d82c2611f48.zip | |
Merge branch 'master' into down-integrate
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/README.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/README.md b/cmake/README.md index 1e7410d8..305ebb88 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -302,6 +302,11 @@ further disable the option `-Dprotobuf_MSVC_STATIC_RUNTIME=OFF`. If it reports NOTFOUND for zlib_include or zlib_lib, you might haven't put the headers or the .lib file in the right directory. +If you already have ZLIB library and headers at some other location on your system then alternatively you can define following configuration flags to locate them: + + -DZLIB_INCLUDE_DIR=<path to dir containing zlib headers> + -DZLIB_LIB=<path to dir containing zlib> + Build and testing protobuf as usual. Notes on Compiler Warnings |