fixing compilation

eclipse-uprotocol · Mar 10, 2024 · 8ab3cf3 · 8ab3cf3
1 parent 39fecbe
commit 8ab3cf3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 32 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -27,7 +27,7 @@ if(BUILD_UNBUNDLED)
     find_package(zenohc REQUIRED)
 else()
     find_library(ZENOH_LIB zenohc)
-    find_package(up-cpp REQUIRED)
+    find_package(up-cpp QUIET)
 endif()
 
 # Support pulling headers outside of /usr/local
@@ -40,42 +40,28 @@ set(SRC_FILES
     src/zenohRpcClient.cpp
     src/zenohSessionManager.cpp
     src/messageBuilder.cpp
-    src/messageParser.cpp
-    )
+    src/messageParser.cpp)
 
 add_library(${PROJECT_NAME} ${SRC_FILES})
 add_library(up-client-zenoh-cpp::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
+target_include_directories(${PROJECT_NAME} 
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> 
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> 
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src)
+
 if(BUILD_UNBUNDLED)
-    target_include_directories(${PROJECT_NAME} 
-        PUBLIC
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> 
-            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> 
-        PRIVATE
-            ${CMAKE_CURRENT_SOURCE_DIR}/src
-    )
     target_link_libraries(${PROJECT_NAME} 
         PRIVATE 
             up-cpp::up-cpp
-            zenohc::lib 
-    )
+            zenohc::lib)
 else()
-    target_include_directories(${PROJECT_NAME} 
-        PRIVATE 
-            ${up-cpp_INCLUDE_DIR}
-            include
-    )
-    if (${up-cpp_FOUND})
-        target_link_libraries(${PROJECT_NAME} 
-            PRIVATE 
+    target_link_libraries(${PROJECT_NAME} 
+        PUBLIC 
             up-cpp::up-cpp 
-            ${ZENOH_LIB})
-    else()
-        target_link_libraries(${PROJECT_NAME} 
-            PRIVATE 
-            up-cpp 
-            ${ZENOH_LIB})
-    endif()
+            ${ZENOH_LIB}) 
 endif()
 
 INSTALL(TARGETS ${PROJECT_NAME})

diff --git a/lib/src/zenohRpcClient.cpp b/lib/src/zenohRpcClient.cpp
@@ -119,25 +119,25 @@ std::future<UPayload> ZenohRpcClient::invokeMethod(const UUri &uri,
 
     if (0 == refCount_) {
         spdlog::error("ZenohRpcClient is not initialized");
-        return std::move(future);
+        return future;
     }
 
     if (false == isRPCMethod(uri.resource())) {
         spdlog::error("URI is not of RPC type");
-        return std::move(future);
+        return future;
     }
 
     if (UMessageType::REQUEST != attributes.type()) {
         spdlog::error("Wrong message type = {}", UMessageTypeToString(attributes.type()).value());
-        return std::move(future);
+        return future;
     }
 
     auto uriHash = std::hash<std::string>{}(LongUriSerializer::serialize(uri));
 
     auto header = MessageBuilder::buildHeader(attributes);
     if (header.empty()) {
         spdlog::error("Failed to build header");
-        return std::move(future);
+        return future;
     }
 
     z_bytes_t bytes;
@@ -167,7 +167,7 @@ std::future<UPayload> ZenohRpcClient::invokeMethod(const UUri &uri,
     if (0 != z_get(z_loan(session_), z_keyexpr(std::to_string(uriHash).c_str()), "", z_move(channel->send), &opts)) {
         spdlog::error("z_get failure");
         z_drop(&map);
-        return std::move(future);
+        return future;
     }
 
     future = threadPool_->submit(handleReply, channel);