Differential D36639 Diff 110743 hadoop3/files/patch-hadoop-hdfs-project_hadoop-hdfs-native-client_src_main_native_libhdfspp_CMakeLists.txt
Changeset View
Changeset View
Standalone View
Standalone View
hadoop3/files/patch-hadoop-hdfs-project_hadoop-hdfs-native-client_src_main_native_libhdfspp_CMakeLists.txt
| --- hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt.orig 2018-10-31 07:05:58 UTC | |||||
| +++ hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt | |||||
| @@ -40,6 +40,8 @@ SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${CYRUS_SA | |||||
| # Specify PROTOBUF_HOME so that find_package picks up the correct version | |||||
| SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};$ENV{PROTOBUF_HOME}") | |||||
| +include(FindProtobuf) | |||||
| +include(FindThreads) | |||||
| find_package(Doxygen) | |||||
| find_package(OpenSSL REQUIRED) | |||||
| find_package(Protobuf REQUIRED) | |||||
| @@ -144,11 +146,11 @@ add_definitions(-DASIO_STANDALONE -DASIO_CPP11_DATE_TI | |||||
| # Disable optimizations if compiling debug | |||||
| set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0") | |||||
| -set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0") | |||||
| +set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 ") | |||||
| if(UNIX) | |||||
| -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11 -g -fPIC -fno-strict-aliasing") | |||||
| -set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fPIC -fno-strict-aliasing") | |||||
| +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11 -g -fPIC -fno-strict-aliasing -L/usr/local/protobuf25/lib -I/usr/local/protobuf25/include -Wl,-rpath=/usr/local/protobuf25/lib") | |||||
| +set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fPIC -fno-strict-aliasing -L/usr/local/protobuf25/lib -I/usr/local/protobuf25/include -Wl,-rpath=/usr/local/protobuf25/lib") | |||||
| endif() | |||||
| if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") | |||||
| @@ -231,7 +233,6 @@ include_directories( SYSTEM | |||||
| ${PROTOBUF_INCLUDE_DIRS} | |||||
| ) | |||||
| - | |||||
| add_subdirectory(third_party/gmock-1.7.0) | |||||
| add_subdirectory(third_party/uriparser2) | |||||
| add_subdirectory(lib) | |||||
| @@ -257,20 +258,20 @@ if (HADOOP_BUILD) | |||||
| hadoop_add_dual_library(hdfspp ${EMPTY_FILE_CC} ${LIBHDFSPP_ALL_OBJECTS}) | |||||
| hadoop_target_link_dual_libraries(hdfspp | |||||
| ${LIB_DL} | |||||
| - ${PROTOBUF_LIBRARY} | |||||
| + ${PROTOBUF_LIBRARIES} | |||||
| ${OPENSSL_LIBRARIES} | |||||
| ${SASL_LIBRARIES} | |||||
| - ${CMAKE_THREAD_LIBS_INIT} | |||||
| + Threads::Threads | |||||
| ) | |||||
| set_target_properties(hdfspp PROPERTIES SOVERSION ${LIBHDFSPP_VERSION}) | |||||
| else (HADOOP_BUILD) | |||||
| add_library(hdfspp_static STATIC ${EMPTY_FILE_CC} ${LIBHDFSPP_ALL_OBJECTS}) | |||||
| target_link_libraries(hdfspp_static | |||||
| ${LIB_DL} | |||||
| - ${PROTOBUF_LIBRARY} | |||||
| + ${PROTOBUF_LIBRARIES} | |||||
| ${OPENSSL_LIBRARIES} | |||||
| ${SASL_LIBRARIES} | |||||
| - ${CMAKE_THREAD_LIBS_INIT} | |||||
| + Threads::Threads | |||||
| ) | |||||
| if(BUILD_SHARED_HDFSPP) | |||||
| add_library(hdfspp SHARED ${EMPTY_FILE_CC} ${LIBHDFSPP_ALL_OBJECTS}) | |||||