HDFS-12237: libhdfs++: PROTOC_IS_COMPATIBLE check fails if protobuf library is built from source. Contributed by Anatoli Shein.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb9c72f8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb9c72f8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb9c72f8 Branch: refs/heads/HDFS-8707 Commit: eb9c72f8a363b639e6f775fe92e34833e15789a7 Parents: ec0af46 Author: James Clampffer <[email protected]> Authored: Mon Aug 14 15:24:13 2017 -0400 Committer: James Clampffer <[email protected]> Committed: Thu Mar 22 16:20:45 2018 -0400 ---------------------------------------------------------------------- .../src/main/native/libhdfspp/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb9c72f8/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt index 812af4b..2bcb49a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt +++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt @@ -65,6 +65,7 @@ endif (NOT THREAD_LOCAL_SUPPORTED) # Check if PROTOC library was compiled with the compatible compiler by trying # to compile some dummy code unset (PROTOC_IS_COMPATIBLE CACHE) +set (CMAKE_REQUIRED_INCLUDES ${PROTOBUF_INCLUDE_DIRS}) set (CMAKE_REQUIRED_LIBRARIES ${PROTOBUF_LIBRARY} ${PROTOBUF_PROTOC_LIBRARY}) check_cxx_source_compiles( "#include <google/protobuf/io/printer.h> @@ -77,8 +78,8 @@ check_cxx_source_compiles( }" PROTOC_IS_COMPATIBLE) if (NOT PROTOC_IS_COMPATIBLE) - message(FATAL_ERROR - "FATAL ERROR: the Protocol Buffers Library and the Libhdfs++ Library must both be compiled \ + message(WARNING + "WARNING: the Protocol Buffers Library and the Libhdfs++ Library must both be compiled \ with the same (or compatible) compiler. Normally only the same major versions of the same \ compiler are compatible with each other.") endif (NOT PROTOC_IS_COMPATIBLE) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
