hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject hadoop git commit: HDFS-12237: libhdfs++: PROTOC_IS_COMPATIBLE check fails if protobuf library is built from source. Contributed by Anatoli Shein.
Date Mon, 14 Aug 2017 19:31:59 GMT
Repository: hadoop
Updated Branches:
  refs/heads/HDFS-8707 411a9f829 -> 5cee74707


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/5cee7470
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5cee7470
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5cee7470

Branch: refs/heads/HDFS-8707
Commit: 5cee74707d2f36b30996be1687f63f7fe5f014fb
Parents: 411a9f8
Author: James Clampffer <james.clampffer@hp.com>
Authored: Mon Aug 14 15:24:13 2017 -0400
Committer: James Clampffer <james.clampffer@hp.com>
Committed: Mon Aug 14 15:25:10 2017 -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/5cee7470/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message