Repository: orc Updated Branches: refs/heads/master 8a845e24c -> 639a7667d
ORC-280. Define Z_PREFIX if zlib built with --zprefix Fixes #202 Signed-off-by: Owen O'Malley <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/639a7667 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/639a7667 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/639a7667 Branch: refs/heads/master Commit: 639a7667d2f7740e4d32dbeb421b249066146f11 Parents: 8a845e2 Author: rip-nsk <[email protected]> Authored: Thu Dec 14 12:20:33 2017 -0800 Committer: Owen O'Malley <[email protected]> Committed: Wed Dec 20 10:29:30 2017 -0800 ---------------------------------------------------------------------- c++/src/Adaptor.hh.in | 5 +++++ c++/src/CMakeLists.txt | 12 ++++++++++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/639a7667/c++/src/Adaptor.hh.in ---------------------------------------------------------------------- diff --git a/c++/src/Adaptor.hh.in b/c++/src/Adaptor.hh.in index 34306e8..c09fa02 100644 --- a/c++/src/Adaptor.hh.in +++ b/c++/src/Adaptor.hh.in @@ -28,6 +28,7 @@ #cmakedefine HAS_STD_ISNAN #cmakedefine HAS_STD_MUTEX #cmakedefine NEEDS_REDUNDANT_MOVE +#cmakedefine NEEDS_Z_PREFIX #include "orc/orc-config.hh" #include <string> @@ -142,4 +143,8 @@ #include <mutex> #endif +#ifdef NEEDS_Z_PREFIX +#define Z_PREFIX 1 +#endif + #endif /* ADAPTER_HH */ http://git-wip-us.apache.org/repos/asf/orc/blob/639a7667/c++/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index 7a39b4d..51811ca 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -111,6 +111,18 @@ CHECK_CXX_SOURCE_RUNS(" HAS_POST_2038 ) +set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR}) +set(CMAKE_REQUIRED_LIBRARIES zlib) +CHECK_CXX_SOURCE_COMPILES(" + #define Z_PREFIX + #include<zlib.h> + z_stream strm; + int main(int, char *[]) { + deflateReset(&strm); + }" + NEEDS_Z_PREFIX +) + configure_file ( "Adaptor.hh.in" "${CMAKE_CURRENT_BINARY_DIR}/Adaptor.hh"
