From eeb49d0ca7149b4dd4204f952983cdc6f0471f00 Mon Sep 17 00:00:00 2001 From: James Clampffer Date: Mon, 14 Aug 2017 15:24:13 -0400 Subject: [PATCH] HDFS-12237: libhdfs++: PROTOC_IS_COMPATIBLE check fails if protobuf library is built from source. Contributed by Anatoli Shein. --- .../src/main/native/libhdfspp/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 812af4beca..2bcb49a8c4 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 @@ -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)