From 430476fcf477d373df7fd4effc28b0d86b735c69 Mon Sep 17 00:00:00 2001 From: Hugo Talbot Date: Wed, 21 Feb 2024 11:14:25 +0100 Subject: [PATCH 1/3] Fix following changes of SimpleApi --- SofaBenchmarkScenes/CMakeLists.txt | 3 ++- SofaBenchmarkScenes/src/SofaBenchmarkScenes/BenchScene.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SofaBenchmarkScenes/CMakeLists.txt b/SofaBenchmarkScenes/CMakeLists.txt index 764f2d9..02ce842 100644 --- a/SofaBenchmarkScenes/CMakeLists.txt +++ b/SofaBenchmarkScenes/CMakeLists.txt @@ -3,6 +3,7 @@ project(SofaBenchmarkScenes) sofa_find_package(Sofa.Simulation.Graph REQUIRED) sofa_find_package(Sofa.Component REQUIRED) +sofa_find_package(Sofa.SimpleApi REQUIRED) set(SOFABENCHMARKSCENES_SRC "src") @@ -24,7 +25,7 @@ set(SOURCE_FILES add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES}) target_link_libraries(${PROJECT_NAME} PUBLIC benchmark::benchmark) -target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Simulation.Graph Sofa.Component) +target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Simulation.Graph Sofa.Component Sofa.SimpleApi) target_include_directories(${PROJECT_NAME} PUBLIC ${SOFABENCHMARKSCENES_SRC}) # regroup benchmark stuff into its own IDE folder diff --git a/SofaBenchmarkScenes/src/SofaBenchmarkScenes/BenchScene.h b/SofaBenchmarkScenes/src/SofaBenchmarkScenes/BenchScene.h index 629d8f0..1b8bae0 100644 --- a/SofaBenchmarkScenes/src/SofaBenchmarkScenes/BenchScene.h +++ b/SofaBenchmarkScenes/src/SofaBenchmarkScenes/BenchScene.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include From 24589aa5f7cd18a2f2ffc4ea41d355c25da3bc68 Mon Sep 17 00:00:00 2001 From: Hugo Talbot Date: Wed, 21 Feb 2024 11:16:26 +0100 Subject: [PATCH 2/3] missing includes --- .../HexahedronFEMForceField_benchmark.cpp | 2 +- .../TetrahedronFEMForceField_benchmark.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp b/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp index faa1461..4def37b 100644 --- a/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp +++ b/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp b/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp index f1f4341..2543546 100644 --- a/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp +++ b/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include From 85e396c52b9e4d8df5ab3ba3611c2c2ba8a2136b Mon Sep 17 00:00:00 2001 From: Hugo Talbot Date: Wed, 21 Feb 2024 11:21:19 +0100 Subject: [PATCH 3/3] missing SimpleApi also in benchmark --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a8488b..6043955 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ sofa_find_package(Sofa.Type REQUIRED) sofa_find_package(Sofa.Core REQUIRED) sofa_find_package(Sofa.Simulation.Graph REQUIRED) sofa_find_package(Sofa.Component.Collision.Geometry REQUIRED) +sofa_find_package(Sofa.SimpleApi REQUIRED) set(SOFABENCHMARK_SRC "src") @@ -62,7 +63,7 @@ endif() add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES}) target_link_libraries(${PROJECT_NAME} PUBLIC benchmark::benchmark) -target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Type Sofa.Core Sofa.Simulation.Graph Sofa.Component.Collision.Geometry) +target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Type Sofa.Core Sofa.Simulation.Graph Sofa.Component.Collision.Geometry Sofa.SimpleApi) target_include_directories(${PROJECT_NAME} PUBLIC ${SOFABENCHMARK_SRC}) # regroup benchmark stuff into its own IDE folder