HDFS-14244 Additional patch to hook up the examples. I promoted enough of the

header files from common to include so that the examples didn't need to use
files that we aren't installing.

Author: omalley

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt

@@ -143,6 +143,13 @@ if (HADOOP_BUILD AND NOT HDFSPP_LIBRARY_ONLY)
 endif ()
 
 if (NOT HDFSPP_LIBRARY_ONLY)
+  ExternalProject_Add(hdfspp_examples
+    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples
+    CMAKE_ARGS ${HDFSPP_CMAKE_ARGS}
+    INSTALL_DIR ${STAGING_DIR}
+    LIST_SEPARATOR |
+    DEPENDS hdfspp
+  )
   ExternalProject_Add(hdfspp_tools
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tools
     CMAKE_ARGS ${HDFSPP_CMAKE_ARGS}

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/examples/CMakeLists.txt

@@ -16,5 +16,27 @@
 # limitations under the License.
 #
 
+cmake_minimum_required(VERSION 2.8.12)
+if (POLICY CMP0042)
+  cmake_policy(SET CMP0042 NEW) # suppress warning about mac rpath
+endif ()
+
+project (HDFSPP_EXAMPLES)
+
+include(DecideSasl)
+
+find_package(ASIO REQUIRED)
+find_package(HDFSPP REQUIRED)
+find_package(Protobuf REQUIRED)
+
+include(HdfsppCompilerOptions)
+
+include_directories(
+  ${HDFSPP_INCLUDE_DIR}
+  ${ASIO_INCLUDE_DIR}
+  )
+
 add_subdirectory(c)
 add_subdirectory(cc)
+
+install(TARGETS)

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/examples/c/cat/CMakeLists.txt

@@ -16,12 +16,5 @@
 # limitations under the License.
 #
 
-# Default LIBHDFSPP_DIR to the default install location.  You can override
-#    it by add -DLIBHDFSPP_DIR=... to your cmake invocation
-set(LIBHDFSPP_DIR CACHE STRING ${CMAKE_INSTALL_PREFIX})
-
-include_directories( ${LIBHDFSPP_DIR}/include )
-link_directories( ${LIBHDFSPP_DIR}/lib )
-
 add_executable(cat_c cat.c)
-target_link_libraries(cat_c hdfspp_static uriparser2)
+target_link_libraries(cat_c hdfspp)

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/examples/c/cat/cat.c

@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "hdfspp/hdfs_ext.h"
-#include "uriparser2/uriparser2.h"
-#include "common/util_c.h"
+#include "hdfspp/uriparser2.h"
+#include "hdfspp/util_c.h"
 
 #define SCHEME "hdfs"
 #define BUF_SIZE 1048576 //1 MB

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/examples/c/connect_cancel/CMakeLists.txt

@@ -16,12 +16,5 @@
 # limitations under the License.
 #
 
-# Default LIBHDFSPP_DIR to the default install location.  You can override
-#    it by add -DLIBHDFSPP_DIR=... to your cmake invocation
-set(LIBHDFSPP_DIR CACHE STRING ${CMAKE_INSTALL_PREFIX})
-
-include_directories( ${LIBHDFSPP_DIR}/include )
-link_directories( ${LIBHDFSPP_DIR}/lib )
-
 add_executable(connect_cancel_c connect_cancel.c)
-target_link_libraries(connect_cancel_c hdfspp_static uriparser2)
+target_link_libraries(connect_cancel_c hdfspp)

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/examples/c/connect_cancel/connect_cancel.c

@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include "hdfspp/hdfs_ext.h"
-#include "common/util_c.h"
+#include "hdfspp/util_c.h"
 
 #define ERROR_BUFFER_SIZE 1024
 

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/examples/cc/cat/CMakeLists.txt

@@ -16,12 +16,6 @@
 # limitations under the License.
 #
 
-# Default LIBHDFSPP_DIR to the default install location.  You can override
-#    it by add -DLIBHDFSPP_DIR=... to your cmake invocation
-set(LIBHDFSPP_DIR CACHE STRING ${CMAKE_INSTALL_PREFIX})
-
-include_directories( ${LIBHDFSPP_DIR}/include )
-link_directories( ${LIBHDFSPP_DIR}/lib )
-
-add_executable(cat cat.cc)
-target_link_libraries(cat tools_common hdfspp_static)
+add_executable(cat cat.cc
+               ${CMAKE_SOURCE_DIR}/../tools/tools_common.cc)
+target_link_libraries(cat hdfspp protobuf)

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/examples/cc/connect_cancel/CMakeLists.txt

@@ -24,4 +24,4 @@ include_directories( ${LIBHDFSPP_DIR}/include )
 link_directories( ${LIBHDFSPP_DIR}/lib )
 
 add_executable(connect_cancel connect_cancel.cc)
-target_link_libraries(connect_cancel hdfspp_static)
+target_link_libraries(connect_cancel hdfspp protobuf)

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/examples/cc/connect_cancel/connect_cancel.cc

@@ -19,8 +19,8 @@
 
 
 #include "hdfspp/hdfspp.h"
-#include "common/hdfs_configuration.h"
-#include "common/configuration_loader.h"
+#include "hdfspp/hdfs_configuration.h"
+#include "hdfspp/configuration_loader.h"
 
 #include <google/protobuf/stubs/common.h>
 

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/examples/cc/find/CMakeLists.txt

@@ -23,5 +23,6 @@ set(LIBHDFSPP_DIR CACHE STRING ${CMAKE_INSTALL_PREFIX})
 include_directories( ${LIBHDFSPP_DIR}/include )
 link_directories( ${LIBHDFSPP_DIR}/lib )
 
-add_executable(find find.cc)
-target_link_libraries(find tools_common hdfspp_static)
+add_executable(find find.cc
+               ${CMAKE_SOURCE_DIR}/../tools/tools_common.cc)
+target_link_libraries(find hdfspp protobuf)