Merge branch 'master' of https://github.com/sofa-framework/sofa

Author: SperryBot

Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.h

@@ -109,7 +109,6 @@ class StopperLagrangianConstraint : public core::behavior::LagrangianConstraint<
 
 
 public:
-    void init() override;
     void buildConstraintMatrix(const core::ConstraintParams* cParams, DataMatrixDeriv &c_d, unsigned int &cIndex, const DataVecCoord &x) override;
     void getConstraintViolation(const core::ConstraintParams* cParams, linearalgebra::BaseVector *resV, const DataVecCoord &x, const DataVecDeriv &v) override;
 

Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.inl

@@ -37,19 +37,6 @@ StopperLagrangianConstraint<DataTypes>::StopperLagrangianConstraint(MechanicalSt
 {
 }
 
-template<class DataTypes>
-void StopperLagrangianConstraint<DataTypes>::init()
-{
-    this->mstate = dynamic_cast<MechanicalState*>(this->getContext()->getMechanicalState());
-
-    helper::WriteAccessor<Data<VecCoord> > xData = *this->mstate->write(core::vec_id::write_access::position);
-    VecCoord& x = xData.wref();
-    if (x[d_index.getValue()].x() < d_min.getValue())
-        x[d_index.getValue()].x() = (Real) d_min.getValue();
-    if (x[d_index.getValue()].x() > d_max.getValue())
-        x[d_index.getValue()].x() = (Real) d_max.getValue();
-}
-
 template<class DataTypes>
 void StopperLagrangianConstraint<DataTypes>::buildConstraintMatrix(const core::ConstraintParams* /*cParams*/, DataMatrixDeriv &c_d, unsigned int &cIndex, const DataVecCoord &/*x*/)
 {

Sofa/framework/Config/CMakeLists.txt

@@ -311,6 +311,8 @@ target_link_options(${PROJECT_NAME} PUBLIC "$<${is_c_cxx_release}:${SOFACONFIG_L
 target_link_options(${PROJECT_NAME} PUBLIC "$<${is_c_cxx_debug}:${SOFACONFIG_LINK_OPTIONS_DEBUG}>")
 target_link_options(${PROJECT_NAME} PUBLIC "$<${is_c_cxx}:${SOFACONFIG_LINK_OPTIONS}>")
 
+sofa_treat_warnings_as_errors(${PROJECT_NAME})
+
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Sofa.Framework) # IDE folder
 
 # Attach Sofa Version into properties

Sofa/framework/Config/cmake/SofaMacrosConfigure.cmake

@@ -515,3 +515,13 @@ macro(sofa_set_targets_release_only)
 endmacro()
 
 
+function(sofa_treat_warnings_as_errors TARGET)
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24")
+        set_property(TARGET ${TARGET} PROPERTY COMPILE_WARNING_AS_ERROR ON)
+    else()
+        target_compile_options(${TARGET} PRIVATE
+            $<$<CXX_COMPILER_ID:MSVC>:/WX>
+            $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Werror>
+        )
+    endif()
+endfunction()