Update zenoh version (#31)

olympus-robotics · Mar 11, 2024 · ede65d3 · ede65d3
1 parent e46ab78
commit ede65d3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/cmake/05_modules.cmake b/cmake/05_modules.cmake
@@ -618,15 +618,6 @@ macro(define_module_test)
   add_executable(${TARGET_NAME} EXCLUDE_FROM_ALL ${TARGET_ARG_SOURCES}) # Don't build on `make`
   add_clang_format(${TARGET_NAME})
 
-  # Add to cmake tests (call using ctest)
-  add_test(
-    NAME ${TARGET_NAME}
-    COMMAND ${TARGET_NAME}
-    WORKING_DIRECTORY ${TARGET_ARG_WORKING_DIRECTORY}
-  )
-
-  add_dependencies(${TESTS_TARGET} ${TARGET_NAME}) # Set this to be built on `make tests`
-
   target_include_directories(
     ${TARGET_NAME} BEFORE
     PUBLIC ${TARGET_ARG_PUBLIC_INCLUDE_PATHS}
@@ -640,12 +631,23 @@ macro(define_module_test)
             ${TARGET_ARG_PRIVATE_LINK_LIBS} GTest::gtest GTest::gmock GTest::gtest_main GTest::gmock_main
   )
 
+  add_dependencies(${TESTS_TARGET} ${TARGET_NAME}) # Set this to be built on `make tests`
+
+  if (NOT BUILD_AS_SUBPROJECT)
+  # Add to cmake tests (call using ctest)
+  add_test(
+    NAME ${TARGET_NAME}
+    COMMAND ${TARGET_NAME}
+    WORKING_DIRECTORY ${TARGET_ARG_WORKING_DIRECTORY}
+  )
+
   gtest_discover_tests(
     ${TARGET_NAME}
     WORKING_DIRECTORY ${TARGET_ARG_WORKING_DIRECTORY}
     PROPERTIES
     TIMEOUT ${TEST_TIMEOUT_SECONDS}
   )
+  endif()
 
 endmacro()
 

diff --git a/docker/version.sh b/docker/version.sh
@@ -3,4 +3,4 @@ VERSION=1.0.3
 IMAGE=hephaestus-dev
 
 # This is the version of the dep image. Increase this number everytime you change `external/CMakeLists.txt`
-DEPS_VERSION=1.0.6
+DEPS_VERSION=1.0.7
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -67,14 +67,14 @@ add_cmake_dependency(
   NAME zenohc
   DEPENDS zenohd
   GIT_REPOSITORY "https://github.com/eclipse-zenoh/zenoh-c.git"
-  GIT_TAG "5be32c83a93c2f7bb1ff8455b01bd479ae3524f5"
+  GIT_TAG "10176b911096cb92b8ee46bc491b78079ee26c20"
 )
 
 add_cmake_dependency(
   NAME zenohcxx
   DEPENDS zenohc
   GIT_REPOSITORY "https://github.com/eclipse-zenoh/zenoh-cpp.git"
-  GIT_TAG "72cedc9400434829e50835b5c6c7c3dbb82843ca"
+  GIT_TAG "c0b7adb077cbf0b7b0cd04addb6de741b338fc49"
   SOURCE_SUBDIR install
 )
 

diff --git a/modules/utils/src/version_impl.h b/modules/utils/src/version_impl.h
@@ -17,8 +17,8 @@ static constexpr std::uint8_t VERSION_MAJOR = 0;
 static constexpr std::uint8_t VERSION_MINOR = 0;
 static constexpr std::uint16_t VERSION_PATCH = 1;
 
-static constexpr std::string_view REPO_BRANCH = "hephaestus";
+static constexpr std::string_view REPO_BRANCH = "update_zenohc";
 static constexpr std::string_view BUILD_PROFILE = "RelWithDebInfo";
-static constexpr std::string_view REPO_HASH = "f46def4";
+static constexpr std::string_view REPO_HASH = "28cb39d";
 
 } // namespace heph::utils