Merge pull request #101 from DenisBiryukov91/fix/zenohc-pico-branch

fix zenohc/pico branch to main in configure_include_project
eclipse-zenoh · Feb 23, 2024 · 72cedc9 · 72cedc9
2 parents 235745d + cdd39a9
commit 72cedc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake
@@ -214,7 +214,7 @@ endmacro()
 #
 # include_project(zenohc TARGET zenohc::lib PATH ..\zenoh_c QUIET)
 # include_project(zenohc TARGET zenohc::lib PACKAGE zenohc QUIET)
-# include_project(zenohc TARGET zenohc::lib GIT_URL https://github.com/eclipse-zenoh/zenoh-c)
+# include_project(zenohc TARGET zenohc::lib GIT_URL https://github.com/eclipse-zenoh/zenoh-c GIT_TAG main)
 #
 # QUIET parameter not supported for GIT_URL due to lack of support of such mode in FetchContent
 #

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -5,9 +5,9 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
 	set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake ${CMAKE_MODULE_PATH})
     include(helpers)
     set_default_build_type(Release)
-    configure_include_project(ZENOHCXX_ZENOHC zenohc zenohc::lib "../../zenoh-c" zenohc "https://github.com/eclipse-zenoh/zenoh-c" "")
-    configure_include_project(ZENOHPICO zenohpico zenohpico "../../zenoh-pico" zenohc "https://github.com/eclipse-zenoh/zenoh-pico" "")
-    configure_include_project(ZENOHCXX zenohcxx zenohcxx ".." zenohcxx "https://github.com/eclipse-zenoh/zenoh-cpp" "")
+    configure_include_project(ZENOHCXX_ZENOHC zenohc zenohc::lib "../../zenoh-c" zenohc "https://github.com/eclipse-zenoh/zenoh-c" "main")
+    configure_include_project(ZENOHPICO zenohpico zenohpico "../../zenoh-pico" zenohc "https://github.com/eclipse-zenoh/zenoh-pico" "main")
+    configure_include_project(ZENOHCXX zenohcxx zenohcxx ".." zenohcxx "https://github.com/eclipse-zenoh/zenoh-cpp" "main")
     add_custom_target(examples ALL)
 else()
     message(STATUS "zenoh-cxx examples")