HDFS-9497. move lib/proto/cpp_helpers to third-party since it won't have an ASF license. Contributed by Bob Hansen.

2015-12-03 16:44:36 -05:00 · 2015-12-03 16:44:36 -05:00 · 8dac1094d8
commit 8dac1094d8
parent d7ecf396c9
3 changed files with 2 additions and 1 deletions
--- 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
@ -52,6 +52,7 @@ include_directories(
  third_party/rapidxml-1.13
  third_party/gmock-1.7.0
  third_party/tr2
+  third_party/protobuf
  ${OPENSSL_INCLUDE_DIR}
  ../libhdfs/include
 )
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/proto/protoc_gen_hrpc.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/proto/protoc_gen_hrpc.cc
@ -16,7 +16,7 @@
 * limitations under the License.
 */

-#include "cpp_helpers.h"
+#include "protobuf/cpp_helpers.h"

 #include <google/protobuf/compiler/code_generator.h>
 #include <google/protobuf/compiler/plugin.h>
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/protobuf/protobuf/cpp_helpers.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/protobuf/protobuf/cpp_helpers.h