Squashed commit of the following:

commit f42f835 Merge: 8b4514f 32ab0f4 Author: Hugo <[email protected]> Date: Wed Jan 22 10:06:13 2025 +0100 Merge pull request SofaDefrost#150 from alxbilger/test Fix tests compilation with respect to SOFA commit 8b4514f Merge: b482378 09d07e3 Author: Olivier Roussel <[email protected]> Date: Mon Jan 20 17:08:57 2025 +0100 Merge pull request SofaDefrost#151 from olivier-roussel/remove-python2 Remove deprecated python2.7 support commit 09d07e3 Author: Olivier Roussel <[email protected]> Date: Mon Jan 20 15:34:00 2025 +0100 Remove deprecated python2.7 support commit 32ab0f4 Author: Alex Bilger <[email protected]> Date: Thu Jan 16 09:34:18 2025 +0100 Fix tests compilation with respect to SOFA
bakpaul · Jan 31, 2025 · a1b4189 · a1b4189
1 parent 3516c63
commit a1b4189
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,8 +97,6 @@ if (CollisionOBBCapsule_FOUND)
 endif()
 
 # Config files and install rules for pythons scripts
-sofa_install_pythonscripts(PLUGIN_NAME ${PROJECT_NAME} PYTHONSCRIPTS_SOURCE_DIR "python")
-
 find_file(SofaPython3Tools NAMES "SofaPython3/lib/cmake/SofaPython3/SofaPython3Tools.cmake")
 if(SofaPython3Tools)
     message("-- Found SofaPython3Tools.")

diff --git a/ModelOrderReduction_test/ModelOrderReduction_test.cpp b/ModelOrderReduction_test/ModelOrderReduction_test.cpp
@@ -24,7 +24,7 @@ namespace sofa {
         simulation::Simulation* simulation;
 
         /// Create the context for the scene
-        void SetUp()
+        void doSetUp() override
         {
             root = simulation::getSimulation()->createNewGraph("root");
         }
@@ -37,7 +37,7 @@ namespace sofa {
         }
 
         /// Unload the scene
-        void TearDown()
+        void doTearDown() override
         {
             if (root != nullptr)
             {