diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30ebecf..6522dd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: env: osqp_TAG: v0.6.3 vcpkg_robotology_TAG: v0.0.3 - Catch2_TAG: v3.0.1 + Catch2_TAG: v3.8.0 # Overwrite the VCPKG_INSTALLATION_ROOT env variable defined by GitHub Actions to point to our vcpkg VCPKG_INSTALLATION_ROOT: C:\robotology\vcpkg diff --git a/CMakeLists.txt b/CMakeLists.txt index b92d8e1..881b8eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,6 +110,8 @@ add_library(${LIBRARY_TARGET_NAME} ${${LIBRARY_TARGET_NAME}_SRC} ${${LIBRARY_TAR target_include_directories(${LIBRARY_TARGET_NAME} PUBLIC "$" "$") +ADD_WARNINGS_CONFIGURATION_TO_TARGETS(PRIVATE TARGETS ${LIBRARY_TARGET_NAME}) + target_link_libraries(${LIBRARY_TARGET_NAME} PUBLIC osqp::osqp Eigen3::Eigen) if(OSQP_IS_V1) target_compile_definitions(${LIBRARY_TARGET_NAME} PUBLIC OSQP_EIGEN_OSQP_IS_V1) diff --git a/include/OsqpEigen/Solver.hpp b/include/OsqpEigen/Solver.hpp index f6072b0..8afe685 100644 --- a/include/OsqpEigen/Solver.hpp +++ b/include/OsqpEigen/Solver.hpp @@ -176,7 +176,7 @@ class Solver * Get the primal objective value * @return The primal objective value */ - const c_float getObjValue() const; + c_float getObjValue() const; /** * Get the optimization problem solution. diff --git a/src/Debug.cpp b/src/Debug.cpp index cd6f702..82dbcaf 100644 --- a/src/Debug.cpp +++ b/src/Debug.cpp @@ -22,7 +22,7 @@ class NullStream : public std::ostream } }; -template const NullStream& operator<<(NullStream&& os, const T& value) +template const NullStream& operator<<(NullStream&& os, const T&) { return os; } diff --git a/src/Solver.cpp b/src/Solver.cpp index 87715f8..e01a6d8 100644 --- a/src/Solver.cpp +++ b/src/Solver.cpp @@ -193,7 +193,7 @@ OsqpEigen::Status OsqpEigen::Solver::getStatus() const return static_cast(getInfo()->status_val); } -const c_float OsqpEigen::Solver::getObjValue() const +c_float OsqpEigen::Solver::getObjValue() const { return getInfo()->obj_val; }