Skip to content

Commit

Permalink
enabling full build
Browse files Browse the repository at this point in the history
  • Loading branch information
MelamudMichael committed Mar 10, 2024
1 parent c4fbf18 commit 783f9f0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
11 changes: 5 additions & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,13 @@ class UpClientZenoh(ConanFile):
# self.options["up-cpp"].shared = True

def requirements(self):
if self.options.build_unbundled:
self.requires("protobuf/3.21.12" + ("@cross/cross" if self.options.build_cross_compiling else ""))
self.requires("spdlog/1.13.0")
if self.options.build_testing:
self.requires("gtest/1.14.0")
if self.options.build_unbundled: #each componenet is built independently
self.requires("up-cpp/0.1.5.0-dev")
self.requires("zenohc/cci.20240213")
self.requires("protobuf/3.21.12" + ("@cross/cross" if self.options.build_cross_compiling else ""))
else:
self.requires("up-cpp/0.1")
self.requires("spdlog/1.13.0")
self.requires("protobuf/3.21.12")

def generate(self):
tc = CMakeToolchain(self)
Expand Down
6 changes: 3 additions & 3 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
cmake_minimum_required(VERSION 3.20)
project(up-client-zenoh-cpp VERSION 0.1.0 LANGUAGES CXX)

find_package(Protobuf REQUIRED)
find_package(spdlog REQUIRED)

if(BUILD_UNBUNDLED)
find_package(up-cpp REQUIRED)
find_package(zenohc REQUIRED)
else()
find_library(ZENOH_LIB zenohc)
find_package(up-cpp REQUIRED)
find_package(Protobuf REQUIRED)
find_package(spdlog REQUIRED)
endif()

# Support pulling headers outside of /usr/local
Expand Down
3 changes: 2 additions & 1 deletion lib/src/zenohUTransport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ UStatus ZenohUTransport::term() noexcept {

if (0 == refCount_) {

uint8_t retries;
uint8_t retries = 0;

termPending_ = true;

Expand Down Expand Up @@ -277,6 +277,7 @@ UCode ZenohUTransport::sendPublish(const UUri &uri,
UCode ZenohUTransport::sendQueryable(const UUri &uri,
const UPayload &payload,
const UAttributes &attributes) noexcept {

if (UMessageType::RESPONSE != attributes.type()) {
spdlog::error("Wrong message type = {}", UMessageTypeToString(attributes.type()).value());
return UCode::INVALID_ARGUMENT;
Expand Down

0 comments on commit 783f9f0

Please sign in to comment.