[eclipse-iceoryx#264] Use v2.95.0 tag for iceoryx_hoofs

elBoberido · Jul 5, 2024 · dcbc800 · dcbc800
1 parent df2ba18
commit dcbc800
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/iceoryx2-ffi/cxx/CMakeLists.txt b/iceoryx2-ffi/cxx/CMakeLists.txt
@@ -12,15 +12,14 @@
 
 cmake_minimum_required(VERSION 3.22)
 
-# TODO use this in fetch-iceoryx-hoofs.cmake
-set(ICEORYX_HOOFS_VERSION 2.90.0)
+set(ICEORYX_HOOFS_VERSION 2.95.0)
 include(cmake/fetch-iceoryx-hoofs.cmake)
 
 project(iceoryx2-cxx VERSION ${IOX2_VERSION_STRING} LANGUAGES CXX)
 
 set(PREFIX iceoryx2/v${CMAKE_PROJECT_VERSION})
 
-find_package(iceoryx_hoofs REQUIRED)
+find_package(iceoryx_hoofs ${ICEORYX_HOOFS_VERSION} REQUIRED)
 find_package(iceoryx2-c REQUIRED)
 
 # include only lib -> includes are installed only once despite being used in static lib as well as shared lib

diff --git a/iceoryx2-ffi/cxx/cmake/fetch-iceoryx-hoofs.cmake b/iceoryx2-ffi/cxx/cmake/fetch-iceoryx-hoofs.cmake
@@ -13,8 +13,8 @@
 # NOTE the file is included in '../CMakeLists.txt' and therefore all relative paths must be relative to '../'
 
 # check if iceoryx is in CMAKE_PREFIX_PATH
-find_package(iceoryx_platform QUIET)
-find_package(iceoryx_hoofs QUIET)
+find_package(iceoryx_platform ${ICEORYX_HOOFS_VERSION} QUIET)
+find_package(iceoryx_hoofs ${ICEORYX_HOOFS_VERSION} QUIET)
 
 # fetch iceoryx if not found
 if(NOT iceoryx_platform_FOUND OR NOT iceoryx_hoofs_FOUND)
@@ -29,7 +29,7 @@ if(NOT iceoryx_platform_FOUND OR NOT iceoryx_hoofs_FOUND)
     FetchContent_Declare(
         iceoryx
         GIT_REPOSITORY https://github.com/eclipse-iceoryx/iceoryx.git
-        GIT_TAG d0b16dd7e #v${ICEORYX_HOOFS_VERSION}
+        GIT_TAG v${ICEORYX_HOOFS_VERSION}
         EXCLUDE_FROM_ALL
     )
     FetchContent_GetProperties(iceoryx)
@@ -52,8 +52,8 @@ if(ICEORYX_WITH_FETCH_CONTENT)
     add_subdirectory(${iceoryx_SOURCE_DIR}/iceoryx_platform  ${iceoryx_BINARY_DIR}/iceoryx_platform EXCLUDE_FROM_ALL)
     add_subdirectory(${iceoryx_SOURCE_DIR}/iceoryx_hoofs ${iceoryx_BINARY_DIR}/iceoryx_hoofs EXCLUDE_FROM_ALL)
 
-    find_package(iceoryx_platform REQUIRED)
-    find_package(iceoryx_hoofs REQUIRED)
+    find_package(iceoryx_platform ${ICEORYX_HOOFS_VERSION} REQUIRED)
+    find_package(iceoryx_hoofs ${ICEORYX_HOOFS_VERSION} REQUIRED)
 endif()
 
 if(ICEORYX_WITH_FETCH_CONTENT)

diff --git a/internal/scripts/ci_build_and_install_iceoryx_hoofs.ps1 b/internal/scripts/ci_build_and_install_iceoryx_hoofs.ps1
@@ -21,7 +21,7 @@ $ErrorActionPreference = "Stop"
 
 $NUM_JOBS = (Get-WmiObject Win32_processor).NumberOfLogicalProcessors
 
-git clone --depth 1 --branch main https://github.com/eclipse-iceoryx/iceoryx.git target/iceoryx/src
+git clone --depth 1 --branch v2.95.0 https://github.com/eclipse-iceoryx/iceoryx.git target/iceoryx/src
 
 switch ($mode) {
     "release" {

diff --git a/internal/scripts/ci_build_and_install_iceoryx_hoofs.sh b/internal/scripts/ci_build_and_install_iceoryx_hoofs.sh
@@ -27,7 +27,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
     NUM_JOBS=$(sysctl -n hw.ncpu)
 fi
 
-git clone --depth 1 --branch main https://github.com/eclipse-iceoryx/iceoryx.git target/iceoryx/src
+git clone --depth 1 --branch v2.95.0 https://github.com/eclipse-iceoryx/iceoryx.git target/iceoryx/src
 
 cmake -S target/iceoryx/src/iceoryx_platform -B target/iceoryx/build/platform -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=target/iceoryx/install
 cmake --build target/iceoryx/build/platform -j$NUM_JOBS