Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switching dependencies to zenohcpp #64

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ jobs:
run: |
conan create --version 0.2.0 --build=missing up-conan-recipes/up-cpp/developer

- name: Build zenohc conan package
- name: Build zenohcpp conan package
shell: bash
run: |
conan create --version 0.11.0.3 up-conan-recipes/zenohc-tmp/prebuilt
conan create --version 0.11.0 up-conan-recipes/zenohc-tmp/prebuilt
conan create --version 0.11.0 up-conan-recipes/zenohcpp-tmp/from-source

- name: Fetch up-transport-zenoh-cpp
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ find_package(protobuf REQUIRED)
find_package(spdlog REQUIRED)
find_package(up-core-api REQUIRED)
find_package(up-cpp REQUIRED)
find_package(zenohc REQUIRED)
find_package(zenohcpp REQUIRED)

# TODO NEEDED?
#add_definitions(-DSPDLOG_FMT_EXTERNAL)
Expand All @@ -41,7 +41,7 @@ target_include_directories(${PROJECT_NAME}
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
${zenohc_INCLUDE_DIR}
${zenohcpp_INCLUDE_DIR}
${up-cpp_INCLUDE_DIR}
${up-core-api_INCLUDE_DIR}
${protobuf_INCLUDE_DIR}
Expand All @@ -51,7 +51,7 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)

target_link_libraries(${PROJECT_NAME}
PRIVATE
zenohc::lib
zenohcpp::lib
up-cpp::up-cpp
up-core-api::up-core-api
protobuf::libprotobuf
Expand Down
2 changes: 1 addition & 1 deletion conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[requires]
up-cpp/0.2.0
zenohc/0.11.0.3
zenohcpp/0.11.0
# Should result in using the packages from up-cpp
spdlog/[>=1.13.0]
up-core-api/[>=1.5.8]
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function(add_coverage_test Name)
up-core-api::up-core-api
up-cpp::up-cpp
up-cpp::up-transport-zenoh-cpp
zenohc::lib
zenohcpp::lib
spdlog::spdlog
protobuf::protobuf
PRIVATE
Expand Down