Skip to content

[All] CMake: an other round of speedup (configure stage) #5611

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

Merged
hugtalbot merged 5 commits into from
Jul 23, 2025
Merged

[All] CMake: an other round of speedup (configure stage) #5611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46956be
wip
fredroy Jul 14, 2025
9b71695
apply to sofa.component
fredroy Jul 15, 2025
1863aaf
even faster with global keyword at project scale
fredroy Jul 15, 2025
23ead1b
Update Sofa.TypeConfig.cmake.in
fredroy Jul 16, 2025
c8fdf0d
Merge branch 'master' into cmake_speedup
hugtalbot Jul 23, 2025
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
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ project(Sofa

include(CMakeDependentOption)


if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
# https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_PACKAGE_TARGETS_GLOBAL.html
endif()

# Manually define VERSION
set(Sofa_VERSION_MAJOR 25)
set(Sofa_VERSION_MINOR 12)
Expand Down
5 changes: 3 additions & 2 deletions Sofa/Component/AnimationLoop/Sofa.Component.AnimationLoopConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.Constraint.Lagrangian QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.Constraint.Lagrangian QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
5 changes: 3 additions & 2 deletions ...Collision/Detection/Algorithm/Sofa.Component.Collision.Detection.AlgorithmConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.Collision.Geometry QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.Collision.Geometry QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
5 changes: 3 additions & 2 deletions ...ion/Detection/Intersection/Sofa.Component.Collision.Detection.IntersectionConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.Collision.Geometry QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.Collision.Geometry QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Collision/Detection/Sofa.Component.Collision.DetectionConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

set(SOFACOMPONENTCOLLISIONDETECTION_TARGETS @SOFACOMPONENTCOLLISIONDETECTION_TARGETS@)

find_package(Sofa.Config QUIET REQUIRED)
foreach(target ${SOFACOMPONENTCOLLISIONDETECTION_TARGETS})
find_package(${target} QUIET REQUIRED)
sofa_find_package(${target} QUIET REQUIRED)
endforeach()

if(NOT TARGET @PROJECT_NAME@)
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Collision/Geometry/Sofa.Component.Collision.GeometryConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
11 changes: 6 additions & 5 deletions ...onent/Collision/Response/Contact/Sofa.Component.Collision.Response.ContactConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.Collision.Geometry QUIET REQUIRED)
find_package(Sofa.Component.Collision.Response.Mapper QUIET REQUIRED)
find_package(Sofa.Component.Constraint.Lagrangian QUIET REQUIRED) # FrictionContact needs UnilateralCC, StickContact BilateralInteractionConstraint
find_package(Sofa.Component.SolidMechanics.Spring QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.Collision.Geometry QUIET REQUIRED)
sofa_find_package(Sofa.Component.Collision.Response.Mapper QUIET REQUIRED)
sofa_find_package(Sofa.Component.Constraint.Lagrangian QUIET REQUIRED)
sofa_find_package(Sofa.Component.SolidMechanics.Spring QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
11 changes: 6 additions & 5 deletions ...mponent/Collision/Response/Mapper/Sofa.Component.Collision.Response.MapperConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.Collision.Geometry QUIET REQUIRED)
find_package(Sofa.Component.Mapping.Linear QUIET REQUIRED)
find_package(Sofa.Component.Mapping.NonLinear QUIET REQUIRED)
find_package(Sofa.Component.StateContainer QUIET REQUIRED) # BarycentricMapper needs MechanicalObject
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.Collision.Geometry QUIET REQUIRED)
sofa_find_package(Sofa.Component.Mapping.Linear QUIET REQUIRED)
sofa_find_package(Sofa.Component.Mapping.NonLinear QUIET REQUIRED)
sofa_find_package(Sofa.Component.StateContainer QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Collision/Response/Sofa.Component.Collision.ResponseConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

set(SOFACOMPONENTCOLLISIONRESPONSE_TARGETS @SOFACOMPONENTCOLLISIONRESPONSE_TARGETS@)

find_package(Sofa.Config QUIET REQUIRED)
foreach(target ${SOFACOMPONENTCOLLISIONRESPONSE_TARGETS})
find_package(${target} QUIET REQUIRED)
sofa_find_package(${target} QUIET REQUIRED)
endforeach()

if(NOT TARGET @PROJECT_NAME@)
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Collision/Sofa.Component.CollisionConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

set(SOFACOMPONENTCOLLISION_TARGETS @SOFACOMPONENTCOLLISION_TARGETS@)

find_package(Sofa.Config QUIET REQUIRED)
foreach(target ${SOFACOMPONENTCOLLISION_TARGETS})
find_package(${target} QUIET REQUIRED)
sofa_find_package(${target} QUIET REQUIRED)
endforeach()

if(NOT TARGET @PROJECT_NAME@)
Expand Down
9 changes: 5 additions & 4 deletions ...aint/Lagrangian/Correction/Sofa.Component.Constraint.Lagrangian.CorrectionConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.Mass QUIET REQUIRED)
find_package(Sofa.Component.LinearSolver.Iterative QUIET REQUIRED)
find_package(Sofa.Component.ODESolver.Backward QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.Mass QUIET REQUIRED)
sofa_find_package(Sofa.Component.LinearSolver.Iterative QUIET REQUIRED)
sofa_find_package(Sofa.Component.ODESolver.Backward QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion ...ent/Constraint/Lagrangian/Model/Sofa.Component.Constraint.Lagrangian.ModelConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Constraint/Lagrangian/Sofa.Component.Constraint.LagrangianConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

set(SOFACOMPONENTCONSTRAINTLAGRANGIAN_TARGETS @SOFACOMPONENTCONSTRAINTLAGRANGIAN_TARGETS@)

find_package(Sofa.Config QUIET REQUIRED)
foreach(target ${SOFACOMPONENTCONSTRAINTLAGRANGIAN_TARGETS})
find_package(${target} QUIET REQUIRED)
sofa_find_package(${target} QUIET REQUIRED)
endforeach()

if(NOT TARGET @PROJECT_NAME@)
Expand Down
3 changes: 2 additions & 1 deletion ...t/Constraint/Lagrangian/Solver/Sofa.Component.Constraint.Lagrangian.SolverConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Constraint/Projective/Sofa.Component.Constraint.ProjectiveConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Constraint/Sofa.Component.ConstraintConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

set(SOFACOMPONENTCONSTRAINT_TARGETS @SOFACOMPONENTCONSTRAINT_TARGETS@)

find_package(Sofa.Config QUIET REQUIRED)
foreach(target ${SOFACOMPONENTCONSTRAINT_TARGETS})
find_package(${target} QUIET REQUIRED)
sofa_find_package(${target} QUIET REQUIRED)
endforeach()

if(NOT TARGET @PROJECT_NAME@)
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Controller/Sofa.Component.ControllerConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Diffusion/Sofa.Component.DiffusionConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
5 changes: 3 additions & 2 deletions Sofa/Component/Engine/Analyze/Sofa.Component.Engine.AnalyzeConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.Topology.Container.Dynamic QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.Topology.Container.Dynamic QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Engine/Generate/Sofa.Component.Engine.GenerateConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Engine/Select/Sofa.Component.Engine.SelectConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Engine/Sofa.Component.EngineConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

set(SOFACOMPONENTENGINE_TARGETS @SOFACOMPONENTENGINE_TARGETS@)

find_package(Sofa.Config QUIET REQUIRED)
foreach(target ${SOFACOMPONENTENGINE_TARGETS})
find_package(${target} QUIET REQUIRED)
sofa_find_package(${target} QUIET REQUIRED)
endforeach()

if(NOT TARGET @PROJECT_NAME@)
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/Engine/Transform/Sofa.Component.Engine.TransformConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
5 changes: 3 additions & 2 deletions Sofa/Component/Haptics/Sofa.Component.HapticsConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.Constraint.Lagrangian.Solver QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.Constraint.Lagrangian.Solver QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
5 changes: 3 additions & 2 deletions Sofa/Component/IO/Mesh/Sofa.Component.IO.MeshConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

set(SOFA_COMPONENT_IO_MESH_HAVE_ZLIB @SOFA_COMPONENT_IO_MESH_HAVE_ZLIB@)
if (SOFA_COMPONENT_IO_MESH_HAVE_ZLIB)
find_package(ZLIB QUIET REQUIRED)
sofa_find_package(ZLIB QUIET REQUIRED)
endif()

if(NOT TARGET @PROJECT_NAME@)
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/IO/Sofa.Component.IOConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

set(SOFACOMPONENTIO_TARGETS @SOFACOMPONENTIO_TARGETS@)

find_package(Sofa.Config QUIET REQUIRED)
foreach(target ${SOFACOMPONENTIO_TARGETS})
find_package(${target} QUIET REQUIRED)
sofa_find_package(${target} QUIET REQUIRED)
endforeach()

if(NOT TARGET @PROJECT_NAME@)
Expand Down
9 changes: 5 additions & 4 deletions Sofa/Component/LinearSolver/Direct/Sofa.Component.LinearSolver.DirectConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.LinearSolver.Iterative QUIET REQUIRED)
find_package(Sofa.Component.LinearSolver.Ordering QUIET REQUIRED)
find_package(Threads QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.LinearSolver.Iterative QUIET REQUIRED)
sofa_find_package(Sofa.Component.LinearSolver.Ordering QUIET REQUIRED)
sofa_find_package(Threads QUIET REQUIRED)

set(SOFA_COMPONENT_LINEARSOLVER_DIRECT_HAVE_METIS @SOFA_COMPONENT_LINEARSOLVER_DIRECT_HAVE_METIS@)

Expand Down
5 changes: 3 additions & 2 deletions Sofa/Component/LinearSolver/Iterative/Sofa.Component.LinearSolver.IterativeConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.LinearSystem QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.LinearSystem QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/LinearSolver/Ordering/Sofa.Component.LinearSolver.OrderingConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
9 changes: 5 additions & 4 deletions ...ent/LinearSolver/Preconditioner/Sofa.Component.LinearSolver.PreconditionerConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.ODESolver.Backward QUIET REQUIRED)
find_package(Sofa.Component.LinearSolver.Iterative QUIET REQUIRED)
find_package(Sofa.Component.LinearSolver.Direct QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.ODESolver.Backward QUIET REQUIRED)
sofa_find_package(Sofa.Component.LinearSolver.Iterative QUIET REQUIRED)
sofa_find_package(Sofa.Component.LinearSolver.Direct QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/LinearSolver/Sofa.Component.LinearSolverConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

set(SOFACOMPONENTLINEARSOLVER_TARGETS @SOFACOMPONENTLINEARSOLVER_TARGETS@)

find_package(Sofa.Config QUIET REQUIRED)
foreach(target ${SOFACOMPONENTLINEARSOLVER_TARGETS})
find_package(${target} QUIET REQUIRED)
sofa_find_package(${target} QUIET REQUIRED)
endforeach()

if(NOT TARGET @PROJECT_NAME@)
Expand Down
3 changes: 2 additions & 1 deletion Sofa/Component/LinearSystem/Sofa.Component.LinearSystemConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
7 changes: 4 additions & 3 deletions Sofa/Component/Mapping/Linear/Sofa.Component.Mapping.LinearConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

find_package(Sofa.Simulation.Core QUIET REQUIRED)
find_package(Sofa.Component.Topology.Container.Dynamic QUIET REQUIRED)
find_package(Sofa.Component.Topology.Container.Grid QUIET REQUIRED)
find_package(Sofa.Config QUIET REQUIRED)
sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
sofa_find_package(Sofa.Component.Topology.Container.Dynamic QUIET REQUIRED)
sofa_find_package(Sofa.Component.Topology.Container.Grid QUIET REQUIRED)

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Expand Down
Loading