Skip to content

Commit 2018412

Browse files
authored
Merge pull request #81 from robotology/request_yarp311
Now Yarp 3.11.1 is required
2 parents fdd6b81 + 73619d7 commit 2018412

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/conda-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
9393
run: |
9494
cd ${GITHUB_WORKSPACE}
95-
git clone https://github.com/robotology/yarp
95+
git clone -b yarp-3.11 https://github.com/robotology/yarp
9696
9797
- name: Dependencies from source [Linux&macOS]
9898
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
@@ -115,7 +115,7 @@ jobs:
115115
shell: bash -l {0}
116116
run: |
117117
cd ${GITHUB_WORKSPACE}
118-
git clone https://github.com/robotology/yarp
118+
git clone -b yarp-3.11 https://github.com/robotology/yarp
119119
cd yarp
120120
mkdir build
121121
cd build
@@ -228,7 +228,7 @@ jobs:
228228
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
229229
run: |
230230
cd ${GITHUB_WORKSPACE}
231-
git clone https://github.com/robotology/yarp
231+
git clone -b yarp-3.11 https://github.com/robotology/yarp
232232
233233
- name: Dependencies from source [Linux&macOS]
234234
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
3232
set(YARP_FORCE_DYNAMIC_PLUGINS TRUE CACHE INTERNAL "yarp-devices-ros2 is always built with dynamic plugins")
3333
option(BUILD_SHARED_LIBS "Build libraries as shared as opposed to static" ON)
3434

35-
find_package(YARP 3.8.0 COMPONENTS os sig dev serversql OPTIONAL_COMPONENTS math REQUIRED)
36-
find_package(YARP 3.8.0 COMPONENTS catch2 dev_tests QUIET)
35+
find_package(YARP 3.11.1 COMPONENTS os sig dev serversql OPTIONAL_COMPONENTS math REQUIRED)
36+
find_package(YARP 3.11.1 COMPONENTS catch2 dev_tests QUIET)
3737

3838
if(YARP_catch2_FOUND AND YARP_dev_tests_FOUND)
3939
option(YARP_COMPILE_TESTS "Enable YARP tests" OFF)

0 commit comments

Comments
 (0)