aboutsummaryrefslogtreecommitdiff
path: root/cmake/config.h.in
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2015-06-12 15:49:21 -0700
committerJisi Liu <jisi.liu@gmail.com>2015-06-16 18:27:36 -0700
commit78d470c7a50d3788bf3f819eba99597aea43674f (patch)
treef2d0c53ce1a94234cc4994ea319f1560f44b2f96 /cmake/config.h.in
parent4cbb612299eaf8259db25f5dcda46022fbd1db54 (diff)
downloadprotobuf-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/config.h.in')
-rw-r--r--cmake/config.h.in4
1 files changed, 0 insertions, 4 deletions
diff --git a/cmake/config.h.in b/cmake/config.h.in
deleted file mode 100644
index bca1cbba..00000000
--- a/cmake/config.h.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#define GOOGLE_PROTOBUF_CMAKE_BUILD
-
-#define HAVE_PTHREAD ${HAVE_PTHREAD}
-#define HAVE_ZLIB ${HAVE_ZLIB}