Skip to content

Commit 4854809

Browse files
authored
Add support for osqp v1.0.0 and refresh CI (#252)
1 parent 7804a8e commit 4854809

File tree

8 files changed

+8
-9
lines changed

8 files changed

+8
-9
lines changed

.github/workflows/conda-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
build_type: [Release]
19-
os: [ubuntu-latest, windows-2019, macos-14]
19+
os: [ubuntu-latest, windows-latest, macos-14]
2020
fail-fast: false
2121

2222
steps:

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
website:
1212
name: Build and Deploy
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414

1515
steps:
1616

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# GNU Lesser General Public License v2.1 or any later version.
44

55
cmake_minimum_required(VERSION 3.16)
6-
project(WB-Toolbox LANGUAGES CXX VERSION 6.0.0)
6+
project(WB-Toolbox LANGUAGES CXX VERSION 6.0.1)
77

88
if(WBT_BUILD_DOCS)
99
add_subdirectory(doc)

ci_env.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- robotology
55
dependencies:
66
- cmake
7-
- compilers
7+
- cxx-compiler
88
- make
99
- ninja
1010
- pkg-config

deps/thrift/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set_target_properties(ClockRpc PROPERTIES POSITION_INDEPENDENT_CODE ON)
2121

2222
# Link it with YARP
2323
find_package(YARP 3.0.0 REQUIRED)
24-
target_link_libraries(ClockRpc YARP::YARP_OS)
24+
target_link_libraries(ClockRpc YARP::YARP_os)
2525

2626
# Extract the include directory from the files names
2727
foreach(file ${CLOCK_RPC_FILES})

toolbox/base/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set_target_properties(WBToolboxBase PROPERTIES
2020

2121
target_link_libraries(WBToolboxBase
2222
BlockFactory::Core
23-
YARP::YARP_OS
23+
YARP::YARP_os
2424
YARP::YARP_init
2525
YARP::YARP_dev
2626
iDynTree::idyntree-model

toolbox/library/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ target_include_directories(WBToolbox PUBLIC
9696

9797
# Main dependencies
9898
list(APPEND WBTOOLBOXLIBRARY_EXT_LIBRARIES
99-
YARP::YARP_OS
99+
YARP::YARP_os
100100
YARP::YARP_dev
101101
YARP::YARP_math
102102
iDynTree::idyntree-core

toolbox/library/src/OSQP.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <Eigen/Core>
1717
#include <OsqpEigen/Constants.hpp>
1818
#include <OsqpEigen/OsqpEigen.h>
19-
#include <osqp/util.h>
2019

2120
#include <ostream>
2221
#include <tuple>
@@ -610,7 +609,7 @@ bool wbt::block::OSQP::output(const BlockInformation* blockInfo)
610609

611610
if (pImpl->computeObjVal) {
612611

613-
double objVal = pImpl->sqSolver->workspace()->info->obj_val;
612+
double objVal = pImpl->sqSolver->getObjValue();
614613

615614
OutputSignalPtr objValSignal = blockInfo->getOutputPortSignal(OutputIndex_objVal);
616615
if (!objValSignal) {

0 commit comments

Comments
 (0)