Skip to content

Commit

Permalink
Fix cmake config (#57)
Browse files Browse the repository at this point in the history
* Fix cmake config for external solvers

* Fix typo in logging
  • Loading branch information
olivier-roussel authored Feb 18, 2025
1 parent 653a922 commit cef5957
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 9 additions & 2 deletions SoftRobots.InverseConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,16 @@ find_package(Sofa.Component.Constraint.Lagrangian.Solver QUIET REQUIRED)
find_package(Sofa.Component.Collision.Response.Contact QUIET REQUIRED)
find_package(Sofa.Component.SolidMechanics.FEM.Elastic QUIET REQUIRED)

find_package(libqpOASES REQUIRED)
include_directories(${OASES_INCLUDE_DIRS})
set(SOFTROBOTSINVERSE_ENABLE_QPOASES @SOFTROBOTSINVERSE_ENABLE_QPOASES@)
if(SOFTROBOTSINVERSE_ENABLE_QPOASES)
find_package(qpOASES QUIET)
if(NOT qpOASES_FOUND)
find_package(libqpOASES REQUIRED)
include_directories(${OASES_INCLUDE_DIRS})
endif()
endif()

set(SOFTROBOTSINVERSE_ENABLE_PROXQP @SOFTROBOTSINVERSE_ENABLE_PROXQP@)
if(SOFTROBOTSINVERSE_ENABLE_PROXQP)
find_package(proxsuite QUIET REQUIRED)
endif()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void QPInverseProblemSolver::createProblems()
break;
#endif
default :
msg_error() << "Unkown specified solved: " << d_qpSolver.getValue();
msg_error() << "Unkown specified solver: " << d_qpSolver.getValue();
sofa::core::objectmodel::BaseObject::d_componentState.setValue(sofa::core::objectmodel::ComponentState::Invalid);
break;
}
Expand Down

0 comments on commit cef5957

Please sign in to comment.