From d9bfda598b6cf7d8b7d96c11d01aebfdbdda6fe4 Mon Sep 17 00:00:00 2001 From: Denis Biryukov Date: Fri, 23 Feb 2024 18:39:46 +0100 Subject: [PATCH 1/2] fix zenohc/pico branch to main in configure_include_project --- CMakeLists.txt | 4 ++-- cmake/helpers.cmake | 2 +- examples/CMakeLists.txt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1e5aab0..90b93604 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ include(helpers) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) enable_testing() set_default_build_type(Release) - configure_include_project(ZENOHCXX_ZENOHPICO zenohpico zenohpico "../zenoh-pico" zenohpico "https://github.com/eclipse-zenoh/zenoh-pico" "") - configure_include_project(ZENOHCXX_ZENOHC zenohc zenohc::lib "../zenoh-c" zenohc "https://github.com/eclipse-zenoh/zenoh-c" "") + configure_include_project(ZENOHCXX_ZENOHPICO zenohpico zenohpico "../zenoh-pico" zenohpico "https://github.com/eclipse-zenoh/zenoh-pico" "origin/main") + configure_include_project(ZENOHCXX_ZENOHC zenohc zenohc::lib "../zenoh-c" zenohc "https://github.com/eclipse-zenoh/zenoh-c" "origin/main") endif() # diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake index 38196522..d8f592bf 100644 --- 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 origin/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 index b953ec2b..58f4d884 100644 --- 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" "origin/main") + configure_include_project(ZENOHPICO zenohpico zenohpico "../../zenoh-pico" zenohc "https://github.com/eclipse-zenoh/zenoh-pico" "origin/main") + configure_include_project(ZENOHCXX zenohcxx zenohcxx ".." zenohcxx "https://github.com/eclipse-zenoh/zenoh-cpp" "origin/main") add_custom_target(examples ALL) else() message(STATUS "zenoh-cxx examples") From cdd39a96d4363c142f69a60128e007c875563a8a Mon Sep 17 00:00:00 2001 From: Denis Biryukov Date: Fri, 23 Feb 2024 18:48:04 +0100 Subject: [PATCH 2/2] remove origin prefix --- CMakeLists.txt | 4 ++-- cmake/helpers.cmake | 2 +- examples/CMakeLists.txt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90b93604..3aafedfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ include(helpers) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) enable_testing() set_default_build_type(Release) - configure_include_project(ZENOHCXX_ZENOHPICO zenohpico zenohpico "../zenoh-pico" zenohpico "https://github.com/eclipse-zenoh/zenoh-pico" "origin/main") - configure_include_project(ZENOHCXX_ZENOHC zenohc zenohc::lib "../zenoh-c" zenohc "https://github.com/eclipse-zenoh/zenoh-c" "origin/main") + configure_include_project(ZENOHCXX_ZENOHPICO zenohpico zenohpico "../zenoh-pico" zenohpico "https://github.com/eclipse-zenoh/zenoh-pico" "main") + configure_include_project(ZENOHCXX_ZENOHC zenohc zenohc::lib "../zenoh-c" zenohc "https://github.com/eclipse-zenoh/zenoh-c" "main") endif() # diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake index d8f592bf..04aa39cb 100644 --- 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 GIT_TAG origin/main) +# 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 index 58f4d884..d991399c 100644 --- 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" "origin/main") - configure_include_project(ZENOHPICO zenohpico zenohpico "../../zenoh-pico" zenohc "https://github.com/eclipse-zenoh/zenoh-pico" "origin/main") - configure_include_project(ZENOHCXX zenohcxx zenohcxx ".." zenohcxx "https://github.com/eclipse-zenoh/zenoh-cpp" "origin/main") + 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")