diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2015-06-12 15:49:21 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2015-06-16 18:27:36 -0700 |
commit | 78d470c7a50d3788bf3f819eba99597aea43674f (patch) | |
tree | f2d0c53ce1a94234cc4994ea319f1560f44b2f96 /cmake/pbconfig.h.in | |
parent | 4cbb612299eaf8259db25f5dcda46022fbd1db54 (diff) | |
download | protobuf-78d470c7a50d3788bf3f819eba99597aea43674f.tar.gz protobuf-78d470c7a50d3788bf3f819eba99597aea43674f.tar.bz2 protobuf-78d470c7a50d3788bf3f819eba99597aea43674f.zip |
Make the code independent of config.h
Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather
than providing a config.h
- Make pbconfig.h a manually written file to handle hash conditions
according to platform related macros.
- Remove #include "config.h" from source code.
- Changed the configure.ac and Makefile.am to pass down the macros.
- Change cmake to pass down the the macros.
Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc
Diffstat (limited to 'cmake/pbconfig.h.in')
-rw-r--r-- | cmake/pbconfig.h.in | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/cmake/pbconfig.h.in b/cmake/pbconfig.h.in deleted file mode 100644 index fdc59686..00000000 --- a/cmake/pbconfig.h.in +++ /dev/null @@ -1,9 +0,0 @@ -#define GOOGLE_PROTOBUF_HAVE_HASH_MAP ${HAVE_HASH_MAP} -#define GOOGLE_PROTOBUF_HAVE_HASH_SET ${HAVE_HASH_MAP} - -#define GOOGLE_PROTOBUF_HASH_NAMESPACE ${HASH_NAMESPACE} -#define GOOGLE_PROTOBUF_HASH_MAP_H ${HASH_MAP_H} -#define GOOGLE_PROTOBUF_HASH_MAP_CLASS ${HASH_MAP_CLASS} -#define GOOGLE_PROTOBUF_HASH_SET_H ${HASH_SET_H} -#define GOOGLE_PROTOBUF_HASH_SET_CLASS ${HASH_SET_CLASS} -#define GOOGLE_PROTOBUF_HASH_COMPARE ${HASH_COMPARE} |