Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix following changes of SimpleApi (2) #38

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix following changes of SimpleApi (2) #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
430476f
Fix following changes of SimpleApi
hugtalbot Feb 21, 2024
24589aa
missing includes
hugtalbot Feb 21, 2024
85e396c
missing SimpleApi also in benchmark
hugtalbot Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion SofaBenchmarkScenes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SofaBenchmarkScenes/src/SofaBenchmarkScenes/BenchScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <sofa/simulation/Simulation.h>
#include <sofa/simulation/Node.h>
#include <sofa/simulation/common/SceneLoaderXML.h>
#include <sofa/simulation/graph/SimpleApi.h>
#include <sofa/simpleapi/SimpleApi.h>
#include <sofa/simulation/graph/DAGSimulation.h>

#include <sofa/simulation/graph/init.h>
Expand Down
2 changes: 1 addition & 1 deletion ...enchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <sofa/core/behavior/BaseLocalForceFieldMatrix.h>
#include <sofa/core/behavior/ForceField.h>
#include <sofa/simulation/Simulation.h>
#include <sofa/simulation/graph/SimpleApi.h>
#include <sofa/simpleapi/SimpleApi.h>
#include <sofa/simulation/Node.h>
#include <sofa/simulation/graph/DAGNode.h>

Expand Down
2 changes: 1 addition & 1 deletion ...nchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <sofa/core/behavior/BaseLocalForceFieldMatrix.h>
#include <sofa/core/behavior/ForceField.h>
#include <sofa/simulation/Simulation.h>
#include <sofa/simulation/graph/SimpleApi.h>
#include <sofa/simpleapi/SimpleApi.h>
#include <sofa/simulation/Node.h>
#include <sofa/simulation/graph/DAGNode.h>

Expand Down
Loading