diff --git a/third_party/P2P-Transfer/CMakeLists.txt b/third_party/P2P-Transfer/CMakeLists.txt index 9cd69c8cbe1118b37e9e341f4eaff357f8728035..dd72bbf7cce69c9db887b8525c95e868b6d5e518 100644 --- a/third_party/P2P-Transfer/CMakeLists.txt +++ b/third_party/P2P-Transfer/CMakeLists.txt @@ -46,14 +46,24 @@ if (DEFINED Protobuf_ROOT_DIR) message(STATUS "Protobuf_ROOT_DIR in p2phccl.cmake:: ${Protobuf_ROOT_DIR}") set(ZLIB_ROOT ${ZLIB_ROOT_DIR}) find_package(ZLIB REQUIRED) - set(absl_DIR ${absl_ROOT_DIR}/lib64/cmake/absl) + if (EXISTS ${absl_ROOT_DIR}/lib64) + set(absl_LIB_DIR "${absl_ROOT_DIR}/lib64") + else() + set(absl_LIB_DIR "${absl_ROOT_DIR}/lib") + endif() + set(absl_DIR ${absl_LIB_DIR}/cmake/absl) find_package(utf8_range REQUIRED PATHS ${Protobuf_ROOT_DIR} CONFIG) find_package(Protobuf REQUIRED PATHS ${Protobuf_ROOT_DIR} CONFIG) + if (EXISTS ${Protobuf_ROOT_DIR}/lib64) + set(Protobuf_LIB_DIR "${Protobuf_ROOT_DIR}/lib64") + else() + set(Protobuf_LIB_DIR "${Protobuf_ROOT_DIR}/lib") + endif() get_property(Protobuf_INCLUDE_DIR TARGET protobuf::libprotobuf PROPERTY INTERFACE_INCLUDE_DIRECTORIES) get_property(absl_INCLUDE_DIR TARGET absl::base PROPERTY INTERFACE_INCLUDE_DIRECTORIES) include_directories(SYSTEM ${Protobuf_INCLUDE_DIR}) include_directories(SYSTEM ${absl_INCLUDE_DIR}) - find_library(PROTOBUF_LIBRARY NAMES protobuf PATHS ${Protobuf_ROOT_DIR}/lib64) + find_library(PROTOBUF_LIBRARY NAMES protobuf PATHS ${Protobuf_LIB_DIR}) list(APPEND PROTOBUF_LIBRARY ${ZLIB_LIBRARIES}) message(STATUS "PROTOBUF_LIBRARY: ${PROTOBUF_LIBRARY}") list(APPEND DEPENDS_LIBS ${PROTOBUF_LIBRARY}) @@ -62,7 +72,7 @@ if (DEFINED Protobuf_ROOT_DIR) # TODO: needs to be passed include(${Datasystem_CMAKE_ROOT_DIR}/util.cmake) - set(Protobuf_LIB_PATH ${Protobuf_ROOT_DIR}/lib64) + set(Protobuf_LIB_PATH ${Protobuf_LIB_DIR}) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated) generate_proto_cpp(P2P_PROTO_SRCS_HCCS P2P_PROTO_HDRS_HCCS ${CMAKE_CURRENT_BINARY_DIR}/generated/include/communicator/hccs-ipc/proto/