From 46956be15a9f5695c1a186e0fa28dee6fd372c48 Mon Sep 17 00:00:00 2001 From: Frederick Roy Date: Mon, 14 Jul 2025 16:18:14 +0900 Subject: [PATCH 1/4] wip --- Sofa/GL/Sofa.GLConfig.cmake.in | 9 +++++---- Sofa/GUI/Common/Sofa.GUI.CommonConfig.cmake.in | 13 +++++++------ Sofa/framework/Core/Sofa.CoreConfig.cmake.in | 8 +++++--- .../DefaultType/Sofa.DefaultTypeConfig.cmake.in | 7 ++++--- .../Geometry/Sofa.GeometryConfig.cmake.in | 2 +- .../framework/Helper/Sofa.HelperConfig.cmake.in | 6 +++--- .../Sofa.LinearAlgebraConfig.cmake.in | 9 +++++---- .../SimpleApi/Sofa.SimpleApiConfig.cmake.in | 3 ++- .../Sofa.Simulation.CommonConfig.cmake.in | 5 +++-- .../Core/Sofa.Simulation.CoreConfig.cmake.in | 3 ++- .../Graph/Sofa.Simulation.GraphConfig.cmake.in | 3 ++- .../Simulation/Sofa.SimulationConfig.cmake.in | 4 +++- .../Testing/Sofa.TestingConfig.cmake.in | 17 +++++++++-------- .../Topology/Sofa.TopologyConfig.cmake.in | 4 ++-- Sofa/framework/Type/Sofa.TypeConfig.cmake.in | 4 ++-- 15 files changed, 55 insertions(+), 42 deletions(-) diff --git a/Sofa/GL/Sofa.GLConfig.cmake.in b/Sofa/GL/Sofa.GLConfig.cmake.in index 983040bfe15..9de9950dfc4 100644 --- a/Sofa/GL/Sofa.GLConfig.cmake.in +++ b/Sofa/GL/Sofa.GLConfig.cmake.in @@ -5,10 +5,11 @@ set(SOFA_GL_HAVE_GLEW @SOFA_GL_HAVE_GLEW@) -find_package(Sofa.Helper QUIET REQUIRED) -find_package(Sofa.DefaultType QUIET REQUIRED) -find_package(OpenGL QUIET REQUIRED) -find_package(GLEW QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Sofa.Helper QUIET REQUIRED) +sofa_find_package(Sofa.DefaultType QUIET REQUIRED) +sofa_find_package(OpenGL QUIET REQUIRED) +sofa_find_package(GLEW QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/GUI/Common/Sofa.GUI.CommonConfig.cmake.in b/Sofa/GUI/Common/Sofa.GUI.CommonConfig.cmake.in index 378090bb285..e53ec862902 100644 --- a/Sofa/GUI/Common/Sofa.GUI.CommonConfig.cmake.in +++ b/Sofa/GUI/Common/Sofa.GUI.CommonConfig.cmake.in @@ -5,16 +5,17 @@ set(SOFA_GUI_COMMON_HAVE_SOFA_GL @SOFA_GUI_COMMON_HAVE_SOFA_GL@) -find_package(Sofa.Simulation.Common REQUIRED) -find_package(Sofa.Component.Setting QUIET REQUIRED) -find_package(Sofa.Component.Collision.Response.Contact QUIET REQUIRED) -find_package(Sofa.GUI.Component QUIET REQUIRED) +find_package(Sofa.Config REQUIRED) +sofa_find_package(Sofa.Simulation.Common REQUIRED) +sofa_find_package(Sofa.Component.Setting QUIET REQUIRED) +sofa_find_package(Sofa.Component.Collision.Response.Contact QUIET REQUIRED) +sofa_find_package(Sofa.GUI.Component QUIET REQUIRED) if(NOT TARGET cxxopts) - find_package(cxxopts QUIET REQUIRED) + sofa_find_package(cxxopts QUIET REQUIRED) endif() if(SOFA_GUI_COMMON_HAVE_SOFA_GL) - find_package(Sofa.GL QUIET REQUIRED) + sofa_find_package(Sofa.GL QUIET REQUIRED) endif() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/framework/Core/Sofa.CoreConfig.cmake.in b/Sofa/framework/Core/Sofa.CoreConfig.cmake.in index b566537aae3..870476aa080 100644 --- a/Sofa/framework/Core/Sofa.CoreConfig.cmake.in +++ b/Sofa/framework/Core/Sofa.CoreConfig.cmake.in @@ -5,9 +5,11 @@ set(SOFA_CORE_HAVE_SOFA_COMPONENT_COMPAT "@SOFA_CORE_HAVE_SOFA_COMPONENT_COMPAT@") -find_package(Sofa.Topology QUIET REQUIRED) -find_package(Sofa.Helper QUIET REQUIRED) -find_package(Sofa.DefaultType QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) + +sofa_find_package(Sofa.Topology QUIET REQUIRED) +sofa_find_package(Sofa.Helper QUIET REQUIRED) +sofa_find_package(Sofa.DefaultType QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/framework/DefaultType/Sofa.DefaultTypeConfig.cmake.in b/Sofa/framework/DefaultType/Sofa.DefaultTypeConfig.cmake.in index bc454139ce2..df230520ef2 100644 --- a/Sofa/framework/DefaultType/Sofa.DefaultTypeConfig.cmake.in +++ b/Sofa/framework/DefaultType/Sofa.DefaultTypeConfig.cmake.in @@ -3,9 +3,10 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Helper QUIET REQUIRED) -find_package(Sofa.LinearAlgebra REQUIRED) -find_package(Eigen3 QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Sofa.Helper QUIET REQUIRED) +sofa_find_package(Sofa.LinearAlgebra REQUIRED) +sofa_find_package(Eigen3 QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/framework/Geometry/Sofa.GeometryConfig.cmake.in b/Sofa/framework/Geometry/Sofa.GeometryConfig.cmake.in index 87368fbc479..6dc9d676ad4 100644 --- a/Sofa/framework/Geometry/Sofa.GeometryConfig.cmake.in +++ b/Sofa/framework/Geometry/Sofa.GeometryConfig.cmake.in @@ -4,7 +4,7 @@ @PACKAGE_INIT@ find_package(Sofa.Config QUIET REQUIRED) -find_package(Sofa.Type QUIET REQUIRED) +sofa_find_package(Sofa.Type QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/framework/Helper/Sofa.HelperConfig.cmake.in b/Sofa/framework/Helper/Sofa.HelperConfig.cmake.in index 3dba800cfe3..72532cdfcbb 100644 --- a/Sofa/framework/Helper/Sofa.HelperConfig.cmake.in +++ b/Sofa/framework/Helper/Sofa.HelperConfig.cmake.in @@ -4,10 +4,10 @@ @PACKAGE_INIT@ find_package(Sofa.Config QUIET REQUIRED) -find_package(Sofa.Type QUIET REQUIRED) -find_package(Sofa.Topology QUIET REQUIRED) +sofa_find_package(Sofa.Type QUIET REQUIRED) +sofa_find_package(Sofa.Topology QUIET REQUIRED) -find_package(Eigen3 QUIET REQUIRED) +sofa_find_package(Eigen3 QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/framework/LinearAlgebra/Sofa.LinearAlgebraConfig.cmake.in b/Sofa/framework/LinearAlgebra/Sofa.LinearAlgebraConfig.cmake.in index ee370c5bd06..dd8e508a635 100644 --- a/Sofa/framework/LinearAlgebra/Sofa.LinearAlgebraConfig.cmake.in +++ b/Sofa/framework/LinearAlgebra/Sofa.LinearAlgebraConfig.cmake.in @@ -3,14 +3,15 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Type QUIET REQUIRED) -find_package(Sofa.Helper QUIET REQUIRED) -find_package(Eigen3 QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Sofa.Type QUIET REQUIRED) +sofa_find_package(Sofa.Helper QUIET REQUIRED) +sofa_find_package(Eigen3 QUIET REQUIRED) set(SOFA_LINEARALGEBRA_HAVE_OPENMP @SOFA_LINEARALGEBRA_HAVE_OPENMP@) if (SOFA_LINEARALGEBRA_HAVE_OPENMP) - find_package(OpenMP QUIET REQUIRED) + sofa_find_package(OpenMP QUIET REQUIRED) endif() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/framework/SimpleApi/Sofa.SimpleApiConfig.cmake.in b/Sofa/framework/SimpleApi/Sofa.SimpleApiConfig.cmake.in index ecb08d369b3..67073dba6a6 100644 --- a/Sofa/framework/SimpleApi/Sofa.SimpleApiConfig.cmake.in +++ b/Sofa/framework/SimpleApi/Sofa.SimpleApiConfig.cmake.in @@ -3,7 +3,8 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Simulation.Graph QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Sofa.Simulation.Graph QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/framework/Simulation/Common/Sofa.Simulation.CommonConfig.cmake.in b/Sofa/framework/Simulation/Common/Sofa.Simulation.CommonConfig.cmake.in index a458d995a3a..154261bbd57 100644 --- a/Sofa/framework/Simulation/Common/Sofa.Simulation.CommonConfig.cmake.in +++ b/Sofa/framework/Simulation/Common/Sofa.Simulation.CommonConfig.cmake.in @@ -3,8 +3,9 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Core QUIET REQUIRED) -find_package(Sofa.Simulation.Core QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Sofa.Core QUIET REQUIRED) +sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/framework/Simulation/Core/Sofa.Simulation.CoreConfig.cmake.in b/Sofa/framework/Simulation/Core/Sofa.Simulation.CoreConfig.cmake.in index e914bf97b81..cd9fbedcb6b 100644 --- a/Sofa/framework/Simulation/Core/Sofa.Simulation.CoreConfig.cmake.in +++ b/Sofa/framework/Simulation/Core/Sofa.Simulation.CoreConfig.cmake.in @@ -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") diff --git a/Sofa/framework/Simulation/Graph/Sofa.Simulation.GraphConfig.cmake.in b/Sofa/framework/Simulation/Graph/Sofa.Simulation.GraphConfig.cmake.in index d15f6a5626e..1039e7169de 100644 --- a/Sofa/framework/Simulation/Graph/Sofa.Simulation.GraphConfig.cmake.in +++ b/Sofa/framework/Simulation/Graph/Sofa.Simulation.GraphConfig.cmake.in @@ -3,7 +3,8 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Simulation.Common QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Sofa.Simulation.Common QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/framework/Simulation/Sofa.SimulationConfig.cmake.in b/Sofa/framework/Simulation/Sofa.SimulationConfig.cmake.in index 0f59dbd6c2c..17c10099989 100644 --- a/Sofa/framework/Simulation/Sofa.SimulationConfig.cmake.in +++ b/Sofa/framework/Simulation/Sofa.SimulationConfig.cmake.in @@ -5,8 +5,10 @@ set(SOFASIMULATION_TARGETS @SOFASIMULATION_TARGETS@) +find_package(Sofa.Config QUIET REQUIRED) + foreach(target ${SOFASIMULATION_TARGETS}) - find_package(${target} QUIET REQUIRED) + sofa_find_package(${target} QUIET REQUIRED) endforeach() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/framework/Testing/Sofa.TestingConfig.cmake.in b/Sofa/framework/Testing/Sofa.TestingConfig.cmake.in index 112d1e7c6a4..41424fbc45e 100644 --- a/Sofa/framework/Testing/Sofa.TestingConfig.cmake.in +++ b/Sofa/framework/Testing/Sofa.TestingConfig.cmake.in @@ -3,14 +3,15 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Threads QUIET REQUIRED) -find_package(GTest QUIET REQUIRED) -find_package(SofaGTestMain QUIET REQUIRED) -find_package(Sofa.Helper QUIET REQUIRED) -find_package(Sofa.DefaultType QUIET REQUIRED) -find_package(Sofa.Core QUIET REQUIRED) -find_package(Sofa.Simulation.Graph QUIET REQUIRED) -find_package(Sofa.SimpleApi QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Threads QUIET REQUIRED) +sofa_find_package(GTest QUIET REQUIRED) +sofa_find_package(SofaGTestMain QUIET REQUIRED) +sofa_find_package(Sofa.Helper QUIET REQUIRED) +sofa_find_package(Sofa.DefaultType QUIET REQUIRED) +sofa_find_package(Sofa.Core QUIET REQUIRED) +sofa_find_package(Sofa.Simulation.Graph QUIET REQUIRED) +sofa_find_package(Sofa.SimpleApi QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/framework/Topology/Sofa.TopologyConfig.cmake.in b/Sofa/framework/Topology/Sofa.TopologyConfig.cmake.in index 01bbc8cf0a4..68225b7c0ae 100644 --- a/Sofa/framework/Topology/Sofa.TopologyConfig.cmake.in +++ b/Sofa/framework/Topology/Sofa.TopologyConfig.cmake.in @@ -4,8 +4,8 @@ @PACKAGE_INIT@ find_package(Sofa.Config QUIET REQUIRED) -find_package(Sofa.Type QUIET REQUIRED) -find_package(Sofa.Geometry QUIET REQUIRED) +sofa_find_package(Sofa.Type QUIET REQUIRED) +sofa_find_package(Sofa.Geometry QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/framework/Type/Sofa.TypeConfig.cmake.in b/Sofa/framework/Type/Sofa.TypeConfig.cmake.in index 1ce51404c3a..a716fe6d815 100644 --- a/Sofa/framework/Type/Sofa.TypeConfig.cmake.in +++ b/Sofa/framework/Type/Sofa.TypeConfig.cmake.in @@ -5,11 +5,11 @@ set(SOFA_TYPE_HAVE_SOFA_COMPAT "@SOFA_TYPE_HAVE_SOFA_COMPAT@") +sofa_find_package(Sofa.Config QUIET REQUIRED) find_package(Boost QUIET REQUIRED) -find_package(Sofa.Config QUIET REQUIRED) if(SOFA_TYPE_HAVE_SOFA_COMPAT) - find_package(Sofa.Compat QUIET REQUIRED) + sofa_find_package(Sofa.Compat QUIET REQUIRED) endif() if(NOT TARGET @PROJECT_NAME@) From 9b7169549496ed66f759765aeaece2ef55c9343c Mon Sep 17 00:00:00 2001 From: Frederick Roy Date: Tue, 15 Jul 2025 10:30:16 +0900 Subject: [PATCH 2/4] apply to sofa.component --- .../Sofa.Component.AnimationLoopConfig.cmake.in | 5 +++-- ...onent.Collision.Detection.AlgorithmConfig.cmake.in | 5 +++-- ...nt.Collision.Detection.IntersectionConfig.cmake.in | 5 +++-- .../Sofa.Component.Collision.DetectionConfig.cmake.in | 3 ++- .../Sofa.Component.Collision.GeometryConfig.cmake.in | 3 ++- ...omponent.Collision.Response.ContactConfig.cmake.in | 11 ++++++----- ...Component.Collision.Response.MapperConfig.cmake.in | 11 ++++++----- .../Sofa.Component.Collision.ResponseConfig.cmake.in | 3 ++- .../Collision/Sofa.Component.CollisionConfig.cmake.in | 3 ++- ...nt.Constraint.Lagrangian.CorrectionConfig.cmake.in | 9 +++++---- ...mponent.Constraint.Lagrangian.ModelConfig.cmake.in | 3 ++- ...ofa.Component.Constraint.LagrangianConfig.cmake.in | 3 ++- ...ponent.Constraint.Lagrangian.SolverConfig.cmake.in | 3 ++- ...ofa.Component.Constraint.ProjectiveConfig.cmake.in | 3 ++- .../Sofa.Component.ConstraintConfig.cmake.in | 3 ++- .../Sofa.Component.ControllerConfig.cmake.in | 3 ++- .../Diffusion/Sofa.Component.DiffusionConfig.cmake.in | 3 ++- .../Sofa.Component.Engine.AnalyzeConfig.cmake.in | 5 +++-- .../Sofa.Component.Engine.GenerateConfig.cmake.in | 3 ++- .../Sofa.Component.Engine.SelectConfig.cmake.in | 3 ++- .../Engine/Sofa.Component.EngineConfig.cmake.in | 3 ++- .../Sofa.Component.Engine.TransformConfig.cmake.in | 3 ++- .../Haptics/Sofa.Component.HapticsConfig.cmake.in | 5 +++-- .../IO/Mesh/Sofa.Component.IO.MeshConfig.cmake.in | 5 +++-- Sofa/Component/IO/Sofa.Component.IOConfig.cmake.in | 3 ++- .../Sofa.Component.LinearSolver.DirectConfig.cmake.in | 9 +++++---- ...fa.Component.LinearSolver.IterativeConfig.cmake.in | 5 +++-- ...ofa.Component.LinearSolver.OrderingConfig.cmake.in | 3 ++- ...mponent.LinearSolver.PreconditionerConfig.cmake.in | 9 +++++---- .../Sofa.Component.LinearSolverConfig.cmake.in | 3 ++- .../Sofa.Component.LinearSystemConfig.cmake.in | 3 ++- .../Sofa.Component.Mapping.LinearConfig.cmake.in | 7 ++++--- ...Sofa.Component.Mapping.MappedMatrixConfig.cmake.in | 3 ++- .../Sofa.Component.Mapping.NonLinearConfig.cmake.in | 3 ++- .../Mapping/Sofa.Component.MappingConfig.cmake.in | 3 ++- .../Component/Mass/Sofa.Component.MassConfig.cmake.in | 5 +++-- .../Sofa.Component.MechanicalLoadConfig.cmake.in | 3 ++- .../Sofa.Component.ODESolver.BackwardConfig.cmake.in | 3 ++- .../Sofa.Component.ODESolver.ForwardConfig.cmake.in | 3 ++- .../ODESolver/Sofa.Component.ODESolverConfig.cmake.in | 3 ++- .../Playback/Sofa.Component.PlaybackConfig.cmake.in | 5 +++-- .../Sofa.Component.SceneUtilityConfig.cmake.in | 3 ++- .../Setting/Sofa.Component.SettingConfig.cmake.in | 3 ++- Sofa/Component/Sofa.ComponentConfig.cmake.in | 3 ++- ...omponent.SolidMechanics.FEM.ElasticConfig.cmake.in | 5 +++-- ...ent.SolidMechanics.FEM.HyperElasticConfig.cmake.in | 5 +++-- ...onent.SolidMechanics.FEM.NonUniformConfig.cmake.in | 9 +++++---- .../Sofa.Component.SolidMechanics.FEMConfig.cmake.in | 3 ++- .../Sofa.Component.SolidMechanicsConfig.cmake.in | 3 ++- ...ofa.Component.SolidMechanics.SpringConfig.cmake.in | 3 ++- ...Component.SolidMechanics.TensorMassConfig.cmake.in | 3 ++- .../Sofa.Component.StateContainerConfig.cmake.in | 3 ++- ...mponent.Topology.Container.ConstantConfig.cmake.in | 3 ++- ...omponent.Topology.Container.DynamicConfig.cmake.in | 3 ++- ...a.Component.Topology.Container.GridConfig.cmake.in | 5 +++-- .../Sofa.Component.Topology.ContainerConfig.cmake.in | 3 ++- .../Sofa.Component.Topology.MappingConfig.cmake.in | 7 ++++--- .../Topology/Sofa.Component.TopologyConfig.cmake.in | 3 ++- .../Sofa.Component.Topology.UtilityConfig.cmake.in | 7 ++++--- .../Visual/Sofa.Component.VisualConfig.cmake.in | 5 +++-- 60 files changed, 159 insertions(+), 99 deletions(-) diff --git a/Sofa/Component/AnimationLoop/Sofa.Component.AnimationLoopConfig.cmake.in b/Sofa/Component/AnimationLoop/Sofa.Component.AnimationLoopConfig.cmake.in index 9875f422df6..3cedf1af8a6 100644 --- a/Sofa/Component/AnimationLoop/Sofa.Component.AnimationLoopConfig.cmake.in +++ b/Sofa/Component/AnimationLoop/Sofa.Component.AnimationLoopConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Collision/Detection/Algorithm/Sofa.Component.Collision.Detection.AlgorithmConfig.cmake.in b/Sofa/Component/Collision/Detection/Algorithm/Sofa.Component.Collision.Detection.AlgorithmConfig.cmake.in index f493805a0c4..8d6ac13aabb 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/Sofa.Component.Collision.Detection.AlgorithmConfig.cmake.in +++ b/Sofa/Component/Collision/Detection/Algorithm/Sofa.Component.Collision.Detection.AlgorithmConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Collision/Detection/Intersection/Sofa.Component.Collision.Detection.IntersectionConfig.cmake.in b/Sofa/Component/Collision/Detection/Intersection/Sofa.Component.Collision.Detection.IntersectionConfig.cmake.in index f493805a0c4..8d6ac13aabb 100644 --- a/Sofa/Component/Collision/Detection/Intersection/Sofa.Component.Collision.Detection.IntersectionConfig.cmake.in +++ b/Sofa/Component/Collision/Detection/Intersection/Sofa.Component.Collision.Detection.IntersectionConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Collision/Detection/Sofa.Component.Collision.DetectionConfig.cmake.in b/Sofa/Component/Collision/Detection/Sofa.Component.Collision.DetectionConfig.cmake.in index edcf3152558..bd5f51d6a09 100644 --- a/Sofa/Component/Collision/Detection/Sofa.Component.Collision.DetectionConfig.cmake.in +++ b/Sofa/Component/Collision/Detection/Sofa.Component.Collision.DetectionConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/Collision/Geometry/Sofa.Component.Collision.GeometryConfig.cmake.in b/Sofa/Component/Collision/Geometry/Sofa.Component.Collision.GeometryConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Collision/Geometry/Sofa.Component.Collision.GeometryConfig.cmake.in +++ b/Sofa/Component/Collision/Geometry/Sofa.Component.Collision.GeometryConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Collision/Response/Contact/Sofa.Component.Collision.Response.ContactConfig.cmake.in b/Sofa/Component/Collision/Response/Contact/Sofa.Component.Collision.Response.ContactConfig.cmake.in index 1187d648041..001d4baf6a5 100644 --- a/Sofa/Component/Collision/Response/Contact/Sofa.Component.Collision.Response.ContactConfig.cmake.in +++ b/Sofa/Component/Collision/Response/Contact/Sofa.Component.Collision.Response.ContactConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Collision/Response/Mapper/Sofa.Component.Collision.Response.MapperConfig.cmake.in b/Sofa/Component/Collision/Response/Mapper/Sofa.Component.Collision.Response.MapperConfig.cmake.in index 08e3684999b..e1a3e3dac22 100644 --- a/Sofa/Component/Collision/Response/Mapper/Sofa.Component.Collision.Response.MapperConfig.cmake.in +++ b/Sofa/Component/Collision/Response/Mapper/Sofa.Component.Collision.Response.MapperConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Collision/Response/Sofa.Component.Collision.ResponseConfig.cmake.in b/Sofa/Component/Collision/Response/Sofa.Component.Collision.ResponseConfig.cmake.in index 4d2326c1090..a170e08cb20 100644 --- a/Sofa/Component/Collision/Response/Sofa.Component.Collision.ResponseConfig.cmake.in +++ b/Sofa/Component/Collision/Response/Sofa.Component.Collision.ResponseConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/Collision/Sofa.Component.CollisionConfig.cmake.in b/Sofa/Component/Collision/Sofa.Component.CollisionConfig.cmake.in index eeff644901a..2094121e6a3 100644 --- a/Sofa/Component/Collision/Sofa.Component.CollisionConfig.cmake.in +++ b/Sofa/Component/Collision/Sofa.Component.CollisionConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/Sofa.Component.Constraint.Lagrangian.CorrectionConfig.cmake.in b/Sofa/Component/Constraint/Lagrangian/Correction/Sofa.Component.Constraint.Lagrangian.CorrectionConfig.cmake.in index 19006ce081a..77c35aa531f 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/Sofa.Component.Constraint.Lagrangian.CorrectionConfig.cmake.in +++ b/Sofa/Component/Constraint/Lagrangian/Correction/Sofa.Component.Constraint.Lagrangian.CorrectionConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Constraint/Lagrangian/Model/Sofa.Component.Constraint.Lagrangian.ModelConfig.cmake.in b/Sofa/Component/Constraint/Lagrangian/Model/Sofa.Component.Constraint.Lagrangian.ModelConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/Sofa.Component.Constraint.Lagrangian.ModelConfig.cmake.in +++ b/Sofa/Component/Constraint/Lagrangian/Model/Sofa.Component.Constraint.Lagrangian.ModelConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Constraint/Lagrangian/Sofa.Component.Constraint.LagrangianConfig.cmake.in b/Sofa/Component/Constraint/Lagrangian/Sofa.Component.Constraint.LagrangianConfig.cmake.in index 7edd58c2231..0ac528482be 100644 --- a/Sofa/Component/Constraint/Lagrangian/Sofa.Component.Constraint.LagrangianConfig.cmake.in +++ b/Sofa/Component/Constraint/Lagrangian/Sofa.Component.Constraint.LagrangianConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/Sofa.Component.Constraint.Lagrangian.SolverConfig.cmake.in b/Sofa/Component/Constraint/Lagrangian/Solver/Sofa.Component.Constraint.Lagrangian.SolverConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/Sofa.Component.Constraint.Lagrangian.SolverConfig.cmake.in +++ b/Sofa/Component/Constraint/Lagrangian/Solver/Sofa.Component.Constraint.Lagrangian.SolverConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Constraint/Projective/Sofa.Component.Constraint.ProjectiveConfig.cmake.in b/Sofa/Component/Constraint/Projective/Sofa.Component.Constraint.ProjectiveConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Constraint/Projective/Sofa.Component.Constraint.ProjectiveConfig.cmake.in +++ b/Sofa/Component/Constraint/Projective/Sofa.Component.Constraint.ProjectiveConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Constraint/Sofa.Component.ConstraintConfig.cmake.in b/Sofa/Component/Constraint/Sofa.Component.ConstraintConfig.cmake.in index 225d730f54b..a4b730b0b16 100644 --- a/Sofa/Component/Constraint/Sofa.Component.ConstraintConfig.cmake.in +++ b/Sofa/Component/Constraint/Sofa.Component.ConstraintConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/Controller/Sofa.Component.ControllerConfig.cmake.in b/Sofa/Component/Controller/Sofa.Component.ControllerConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Controller/Sofa.Component.ControllerConfig.cmake.in +++ b/Sofa/Component/Controller/Sofa.Component.ControllerConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Diffusion/Sofa.Component.DiffusionConfig.cmake.in b/Sofa/Component/Diffusion/Sofa.Component.DiffusionConfig.cmake.in index 552d79796ad..03f693fc48e 100644 --- a/Sofa/Component/Diffusion/Sofa.Component.DiffusionConfig.cmake.in +++ b/Sofa/Component/Diffusion/Sofa.Component.DiffusionConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Engine/Analyze/Sofa.Component.Engine.AnalyzeConfig.cmake.in b/Sofa/Component/Engine/Analyze/Sofa.Component.Engine.AnalyzeConfig.cmake.in index 7857ac95a1c..bd346118ac9 100644 --- a/Sofa/Component/Engine/Analyze/Sofa.Component.Engine.AnalyzeConfig.cmake.in +++ b/Sofa/Component/Engine/Analyze/Sofa.Component.Engine.AnalyzeConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Engine/Generate/Sofa.Component.Engine.GenerateConfig.cmake.in b/Sofa/Component/Engine/Generate/Sofa.Component.Engine.GenerateConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Engine/Generate/Sofa.Component.Engine.GenerateConfig.cmake.in +++ b/Sofa/Component/Engine/Generate/Sofa.Component.Engine.GenerateConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Engine/Select/Sofa.Component.Engine.SelectConfig.cmake.in b/Sofa/Component/Engine/Select/Sofa.Component.Engine.SelectConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Engine/Select/Sofa.Component.Engine.SelectConfig.cmake.in +++ b/Sofa/Component/Engine/Select/Sofa.Component.Engine.SelectConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Engine/Sofa.Component.EngineConfig.cmake.in b/Sofa/Component/Engine/Sofa.Component.EngineConfig.cmake.in index 1f111f0d07e..7e5cccfdc72 100644 --- a/Sofa/Component/Engine/Sofa.Component.EngineConfig.cmake.in +++ b/Sofa/Component/Engine/Sofa.Component.EngineConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/Engine/Transform/Sofa.Component.Engine.TransformConfig.cmake.in b/Sofa/Component/Engine/Transform/Sofa.Component.Engine.TransformConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Engine/Transform/Sofa.Component.Engine.TransformConfig.cmake.in +++ b/Sofa/Component/Engine/Transform/Sofa.Component.Engine.TransformConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Haptics/Sofa.Component.HapticsConfig.cmake.in b/Sofa/Component/Haptics/Sofa.Component.HapticsConfig.cmake.in index 847250179be..12244363cef 100644 --- a/Sofa/Component/Haptics/Sofa.Component.HapticsConfig.cmake.in +++ b/Sofa/Component/Haptics/Sofa.Component.HapticsConfig.cmake.in @@ -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") diff --git a/Sofa/Component/IO/Mesh/Sofa.Component.IO.MeshConfig.cmake.in b/Sofa/Component/IO/Mesh/Sofa.Component.IO.MeshConfig.cmake.in index a8405e9f065..ba7c44e0c8c 100644 --- a/Sofa/Component/IO/Mesh/Sofa.Component.IO.MeshConfig.cmake.in +++ b/Sofa/Component/IO/Mesh/Sofa.Component.IO.MeshConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/IO/Sofa.Component.IOConfig.cmake.in b/Sofa/Component/IO/Sofa.Component.IOConfig.cmake.in index d93736838dd..02b0a7630ba 100644 --- a/Sofa/Component/IO/Sofa.Component.IOConfig.cmake.in +++ b/Sofa/Component/IO/Sofa.Component.IOConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/LinearSolver/Direct/Sofa.Component.LinearSolver.DirectConfig.cmake.in b/Sofa/Component/LinearSolver/Direct/Sofa.Component.LinearSolver.DirectConfig.cmake.in index 1f2cb672085..38b2d78289b 100644 --- a/Sofa/Component/LinearSolver/Direct/Sofa.Component.LinearSolver.DirectConfig.cmake.in +++ b/Sofa/Component/LinearSolver/Direct/Sofa.Component.LinearSolver.DirectConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/LinearSolver/Iterative/Sofa.Component.LinearSolver.IterativeConfig.cmake.in b/Sofa/Component/LinearSolver/Iterative/Sofa.Component.LinearSolver.IterativeConfig.cmake.in index dbee5c81dc9..a69f4254d0f 100644 --- a/Sofa/Component/LinearSolver/Iterative/Sofa.Component.LinearSolver.IterativeConfig.cmake.in +++ b/Sofa/Component/LinearSolver/Iterative/Sofa.Component.LinearSolver.IterativeConfig.cmake.in @@ -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") diff --git a/Sofa/Component/LinearSolver/Ordering/Sofa.Component.LinearSolver.OrderingConfig.cmake.in b/Sofa/Component/LinearSolver/Ordering/Sofa.Component.LinearSolver.OrderingConfig.cmake.in index e914bf97b81..cd9fbedcb6b 100644 --- a/Sofa/Component/LinearSolver/Ordering/Sofa.Component.LinearSolver.OrderingConfig.cmake.in +++ b/Sofa/Component/LinearSolver/Ordering/Sofa.Component.LinearSolver.OrderingConfig.cmake.in @@ -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") diff --git a/Sofa/Component/LinearSolver/Preconditioner/Sofa.Component.LinearSolver.PreconditionerConfig.cmake.in b/Sofa/Component/LinearSolver/Preconditioner/Sofa.Component.LinearSolver.PreconditionerConfig.cmake.in index 567ee61690c..1a6e6af8bea 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/Sofa.Component.LinearSolver.PreconditionerConfig.cmake.in +++ b/Sofa/Component/LinearSolver/Preconditioner/Sofa.Component.LinearSolver.PreconditionerConfig.cmake.in @@ -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") diff --git a/Sofa/Component/LinearSolver/Sofa.Component.LinearSolverConfig.cmake.in b/Sofa/Component/LinearSolver/Sofa.Component.LinearSolverConfig.cmake.in index dd4558e90ba..1303498d02d 100644 --- a/Sofa/Component/LinearSolver/Sofa.Component.LinearSolverConfig.cmake.in +++ b/Sofa/Component/LinearSolver/Sofa.Component.LinearSolverConfig.cmake.in @@ -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@) diff --git a/Sofa/Component/LinearSystem/Sofa.Component.LinearSystemConfig.cmake.in b/Sofa/Component/LinearSystem/Sofa.Component.LinearSystemConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/LinearSystem/Sofa.Component.LinearSystemConfig.cmake.in +++ b/Sofa/Component/LinearSystem/Sofa.Component.LinearSystemConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Mapping/Linear/Sofa.Component.Mapping.LinearConfig.cmake.in b/Sofa/Component/Mapping/Linear/Sofa.Component.Mapping.LinearConfig.cmake.in index e32676f6317..d7ed2d7229b 100644 --- a/Sofa/Component/Mapping/Linear/Sofa.Component.Mapping.LinearConfig.cmake.in +++ b/Sofa/Component/Mapping/Linear/Sofa.Component.Mapping.LinearConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Mapping/MappedMatrix/Sofa.Component.Mapping.MappedMatrixConfig.cmake.in b/Sofa/Component/Mapping/MappedMatrix/Sofa.Component.Mapping.MappedMatrixConfig.cmake.in index 552d79796ad..03f693fc48e 100644 --- a/Sofa/Component/Mapping/MappedMatrix/Sofa.Component.Mapping.MappedMatrixConfig.cmake.in +++ b/Sofa/Component/Mapping/MappedMatrix/Sofa.Component.Mapping.MappedMatrixConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Mapping/NonLinear/Sofa.Component.Mapping.NonLinearConfig.cmake.in b/Sofa/Component/Mapping/NonLinear/Sofa.Component.Mapping.NonLinearConfig.cmake.in index 552d79796ad..03f693fc48e 100644 --- a/Sofa/Component/Mapping/NonLinear/Sofa.Component.Mapping.NonLinearConfig.cmake.in +++ b/Sofa/Component/Mapping/NonLinear/Sofa.Component.Mapping.NonLinearConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Mapping/Sofa.Component.MappingConfig.cmake.in b/Sofa/Component/Mapping/Sofa.Component.MappingConfig.cmake.in index fd5bb6ef010..a24d1734fc5 100644 --- a/Sofa/Component/Mapping/Sofa.Component.MappingConfig.cmake.in +++ b/Sofa/Component/Mapping/Sofa.Component.MappingConfig.cmake.in @@ -5,8 +5,9 @@ set(SOFACOMPONENTMAPPING_TARGETS @SOFACOMPONENTMAPPING_TARGETS@) +find_package(Sofa.Config QUIET REQUIRED) foreach(target ${SOFACOMPONENTMAPPING_TARGETS}) - find_package(${target} QUIET REQUIRED) + sofa_find_package(${target} QUIET REQUIRED) endforeach() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/Component/Mass/Sofa.Component.MassConfig.cmake.in b/Sofa/Component/Mass/Sofa.Component.MassConfig.cmake.in index b1e936e197a..5ebd01a7eb5 100644 --- a/Sofa/Component/Mass/Sofa.Component.MassConfig.cmake.in +++ b/Sofa/Component/Mass/Sofa.Component.MassConfig.cmake.in @@ -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") diff --git a/Sofa/Component/MechanicalLoad/Sofa.Component.MechanicalLoadConfig.cmake.in b/Sofa/Component/MechanicalLoad/Sofa.Component.MechanicalLoadConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/MechanicalLoad/Sofa.Component.MechanicalLoadConfig.cmake.in +++ b/Sofa/Component/MechanicalLoad/Sofa.Component.MechanicalLoadConfig.cmake.in @@ -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") diff --git a/Sofa/Component/ODESolver/Backward/Sofa.Component.ODESolver.BackwardConfig.cmake.in b/Sofa/Component/ODESolver/Backward/Sofa.Component.ODESolver.BackwardConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/ODESolver/Backward/Sofa.Component.ODESolver.BackwardConfig.cmake.in +++ b/Sofa/Component/ODESolver/Backward/Sofa.Component.ODESolver.BackwardConfig.cmake.in @@ -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") diff --git a/Sofa/Component/ODESolver/Forward/Sofa.Component.ODESolver.ForwardConfig.cmake.in b/Sofa/Component/ODESolver/Forward/Sofa.Component.ODESolver.ForwardConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/ODESolver/Forward/Sofa.Component.ODESolver.ForwardConfig.cmake.in +++ b/Sofa/Component/ODESolver/Forward/Sofa.Component.ODESolver.ForwardConfig.cmake.in @@ -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") diff --git a/Sofa/Component/ODESolver/Sofa.Component.ODESolverConfig.cmake.in b/Sofa/Component/ODESolver/Sofa.Component.ODESolverConfig.cmake.in index b864e73913d..22aa1378b93 100644 --- a/Sofa/Component/ODESolver/Sofa.Component.ODESolverConfig.cmake.in +++ b/Sofa/Component/ODESolver/Sofa.Component.ODESolverConfig.cmake.in @@ -5,8 +5,9 @@ set(SOFACOMPONENTODESOLVER_TARGETS @SOFACOMPONENTODESOLVER_TARGETS@) +find_package(Sofa.Config QUIET REQUIRED) foreach(target ${SOFACOMPONENTODESOLVER_TARGETS}) - find_package(${target} QUIET REQUIRED) + sofa_find_package(${target} QUIET REQUIRED) endforeach() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/Component/Playback/Sofa.Component.PlaybackConfig.cmake.in b/Sofa/Component/Playback/Sofa.Component.PlaybackConfig.cmake.in index 029bb1bad05..2872270eadc 100644 --- a/Sofa/Component/Playback/Sofa.Component.PlaybackConfig.cmake.in +++ b/Sofa/Component/Playback/Sofa.Component.PlaybackConfig.cmake.in @@ -5,10 +5,11 @@ set(SOFA_COMPONENT_IO_MISC_HAVE_ZLIB @SOFA_COMPONENT_IO_MISC_HAVE_ZLIB@) -find_package(Sofa.Simulation.Common QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Sofa.Simulation.Common QUIET REQUIRED) if (SOFA_COMPONENT_IO_MISC_HAVE_ZLIB) - find_package(ZLIB QUIET REQUIRED) + sofa_find_package(ZLIB QUIET REQUIRED) endif() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/Component/SceneUtility/Sofa.Component.SceneUtilityConfig.cmake.in b/Sofa/Component/SceneUtility/Sofa.Component.SceneUtilityConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/SceneUtility/Sofa.Component.SceneUtilityConfig.cmake.in +++ b/Sofa/Component/SceneUtility/Sofa.Component.SceneUtilityConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Setting/Sofa.Component.SettingConfig.cmake.in b/Sofa/Component/Setting/Sofa.Component.SettingConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Setting/Sofa.Component.SettingConfig.cmake.in +++ b/Sofa/Component/Setting/Sofa.Component.SettingConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Sofa.ComponentConfig.cmake.in b/Sofa/Component/Sofa.ComponentConfig.cmake.in index 7de696ae3e2..5e8951aae58 100644 --- a/Sofa/Component/Sofa.ComponentConfig.cmake.in +++ b/Sofa/Component/Sofa.ComponentConfig.cmake.in @@ -5,8 +5,9 @@ set(SOFACOMPONENT_TARGETS @SOFACOMPONENT_TARGETS@) +find_package(Sofa.Config QUIET REQUIRED) foreach(target ${SOFACOMPONENT_TARGETS}) - find_package(${target} QUIET REQUIRED) + sofa_find_package(${target} QUIET REQUIRED) endforeach() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/Sofa.Component.SolidMechanics.FEM.ElasticConfig.cmake.in b/Sofa/Component/SolidMechanics/FEM/Elastic/Sofa.Component.SolidMechanics.FEM.ElasticConfig.cmake.in index 75fb826abe9..5e94811a2f4 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/Sofa.Component.SolidMechanics.FEM.ElasticConfig.cmake.in +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/Sofa.Component.SolidMechanics.FEM.ElasticConfig.cmake.in @@ -3,8 +3,9 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Simulation.Core 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.Grid QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/Component/SolidMechanics/FEM/HyperElastic/Sofa.Component.SolidMechanics.FEM.HyperElasticConfig.cmake.in b/Sofa/Component/SolidMechanics/FEM/HyperElastic/Sofa.Component.SolidMechanics.FEM.HyperElasticConfig.cmake.in index 75fb826abe9..5e94811a2f4 100644 --- a/Sofa/Component/SolidMechanics/FEM/HyperElastic/Sofa.Component.SolidMechanics.FEM.HyperElasticConfig.cmake.in +++ b/Sofa/Component/SolidMechanics/FEM/HyperElastic/Sofa.Component.SolidMechanics.FEM.HyperElasticConfig.cmake.in @@ -3,8 +3,9 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Simulation.Core 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.Grid QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/Component/SolidMechanics/FEM/NonUniform/Sofa.Component.SolidMechanics.FEM.NonUniformConfig.cmake.in b/Sofa/Component/SolidMechanics/FEM/NonUniform/Sofa.Component.SolidMechanics.FEM.NonUniformConfig.cmake.in index 9b550a36a18..0f3324c2806 100644 --- a/Sofa/Component/SolidMechanics/FEM/NonUniform/Sofa.Component.SolidMechanics.FEM.NonUniformConfig.cmake.in +++ b/Sofa/Component/SolidMechanics/FEM/NonUniform/Sofa.Component.SolidMechanics.FEM.NonUniformConfig.cmake.in @@ -3,10 +3,11 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Simulation.Core QUIET REQUIRED) -find_package(Sofa.Component.SolidMechanics.FEM.Elastic QUIET REQUIRED) -find_package(Sofa.Component.Topology.Container.Grid 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.SolidMechanics.FEM.Elastic QUIET REQUIRED) +sofa_find_package(Sofa.Component.Topology.Container.Grid 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") diff --git a/Sofa/Component/SolidMechanics/FEM/Sofa.Component.SolidMechanics.FEMConfig.cmake.in b/Sofa/Component/SolidMechanics/FEM/Sofa.Component.SolidMechanics.FEMConfig.cmake.in index 9e70b3ed997..3181df336e9 100644 --- a/Sofa/Component/SolidMechanics/FEM/Sofa.Component.SolidMechanics.FEMConfig.cmake.in +++ b/Sofa/Component/SolidMechanics/FEM/Sofa.Component.SolidMechanics.FEMConfig.cmake.in @@ -5,8 +5,9 @@ set(SOFACOMPONENTSOLIDMECHANICSFEM_TARGETS @SOFACOMPONENTSOLIDMECHANICSFEM_TARGETS@) +find_package(Sofa.Config QUIET REQUIRED) foreach(target ${SOFACOMPONENTSOLIDMECHANICSFEM_TARGETS}) - find_package(${target} QUIET REQUIRED) + sofa_find_package(${target} QUIET REQUIRED) endforeach() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/Component/SolidMechanics/Sofa.Component.SolidMechanicsConfig.cmake.in b/Sofa/Component/SolidMechanics/Sofa.Component.SolidMechanicsConfig.cmake.in index 4e5d938a4b6..25eeb564ad9 100644 --- a/Sofa/Component/SolidMechanics/Sofa.Component.SolidMechanicsConfig.cmake.in +++ b/Sofa/Component/SolidMechanics/Sofa.Component.SolidMechanicsConfig.cmake.in @@ -5,8 +5,9 @@ set(SOFACOMPONENTSOLIDMECHANICS_TARGETS @SOFACOMPONENTSOLIDMECHANICS_TARGETS@) +find_package(Sofa.Config QUIET REQUIRED) foreach(target ${SOFACOMPONENTSOLIDMECHANICS_TARGETS}) - find_package(${target} QUIET REQUIRED) + sofa_find_package(${target} QUIET REQUIRED) endforeach() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/Component/SolidMechanics/Spring/Sofa.Component.SolidMechanics.SpringConfig.cmake.in b/Sofa/Component/SolidMechanics/Spring/Sofa.Component.SolidMechanics.SpringConfig.cmake.in index d029cb847f9..ebfde0e84be 100644 --- a/Sofa/Component/SolidMechanics/Spring/Sofa.Component.SolidMechanics.SpringConfig.cmake.in +++ b/Sofa/Component/SolidMechanics/Spring/Sofa.Component.SolidMechanics.SpringConfig.cmake.in @@ -3,7 +3,8 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Component.Topology.Container.Grid QUIET REQUIRED) +find_package(Sofa.Config 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") diff --git a/Sofa/Component/SolidMechanics/TensorMass/Sofa.Component.SolidMechanics.TensorMassConfig.cmake.in b/Sofa/Component/SolidMechanics/TensorMass/Sofa.Component.SolidMechanics.TensorMassConfig.cmake.in index 552d79796ad..03f693fc48e 100644 --- a/Sofa/Component/SolidMechanics/TensorMass/Sofa.Component.SolidMechanics.TensorMassConfig.cmake.in +++ b/Sofa/Component/SolidMechanics/TensorMass/Sofa.Component.SolidMechanics.TensorMassConfig.cmake.in @@ -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") diff --git a/Sofa/Component/StateContainer/Sofa.Component.StateContainerConfig.cmake.in b/Sofa/Component/StateContainer/Sofa.Component.StateContainerConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/StateContainer/Sofa.Component.StateContainerConfig.cmake.in +++ b/Sofa/Component/StateContainer/Sofa.Component.StateContainerConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Topology/Container/Constant/Sofa.Component.Topology.Container.ConstantConfig.cmake.in b/Sofa/Component/Topology/Container/Constant/Sofa.Component.Topology.Container.ConstantConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Topology/Container/Constant/Sofa.Component.Topology.Container.ConstantConfig.cmake.in +++ b/Sofa/Component/Topology/Container/Constant/Sofa.Component.Topology.Container.ConstantConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Topology/Container/Dynamic/Sofa.Component.Topology.Container.DynamicConfig.cmake.in b/Sofa/Component/Topology/Container/Dynamic/Sofa.Component.Topology.Container.DynamicConfig.cmake.in index 680c31106ed..35254723f3e 100644 --- a/Sofa/Component/Topology/Container/Dynamic/Sofa.Component.Topology.Container.DynamicConfig.cmake.in +++ b/Sofa/Component/Topology/Container/Dynamic/Sofa.Component.Topology.Container.DynamicConfig.cmake.in @@ -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") diff --git a/Sofa/Component/Topology/Container/Grid/Sofa.Component.Topology.Container.GridConfig.cmake.in b/Sofa/Component/Topology/Container/Grid/Sofa.Component.Topology.Container.GridConfig.cmake.in index 87e666bf175..b01e6401706 100644 --- a/Sofa/Component/Topology/Container/Grid/Sofa.Component.Topology.Container.GridConfig.cmake.in +++ b/Sofa/Component/Topology/Container/Grid/Sofa.Component.Topology.Container.GridConfig.cmake.in @@ -3,8 +3,9 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Simulation.Core QUIET REQUIRED) -find_package(Sofa.Component.Topology.Container.Constant QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED) +sofa_find_package(Sofa.Component.Topology.Container.Constant QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/Sofa/Component/Topology/Container/Sofa.Component.Topology.ContainerConfig.cmake.in b/Sofa/Component/Topology/Container/Sofa.Component.Topology.ContainerConfig.cmake.in index b79f1095da4..abfd34424db 100644 --- a/Sofa/Component/Topology/Container/Sofa.Component.Topology.ContainerConfig.cmake.in +++ b/Sofa/Component/Topology/Container/Sofa.Component.Topology.ContainerConfig.cmake.in @@ -5,8 +5,9 @@ set(SOFACOMPONENTTOPOLOGYCONTAINER_TARGETS @SOFACOMPONENTTOPOLOGYCONTAINER_TARGETS@) +find_package(Sofa.Config QUIET REQUIRED) foreach(target ${SOFACOMPONENTTOPOLOGYCONTAINER_TARGETS}) - find_package(${target} QUIET REQUIRED) + sofa_find_package(${target} QUIET REQUIRED) endforeach() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/Component/Topology/Mapping/Sofa.Component.Topology.MappingConfig.cmake.in b/Sofa/Component/Topology/Mapping/Sofa.Component.Topology.MappingConfig.cmake.in index 2a7e83ffaf4..41bb798192c 100644 --- a/Sofa/Component/Topology/Mapping/Sofa.Component.Topology.MappingConfig.cmake.in +++ b/Sofa/Component/Topology/Mapping/Sofa.Component.Topology.MappingConfig.cmake.in @@ -3,9 +3,10 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Simulation.Core QUIET REQUIRED) -find_package(Sofa.Component.Topology.Container.Grid 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.Grid 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") diff --git a/Sofa/Component/Topology/Sofa.Component.TopologyConfig.cmake.in b/Sofa/Component/Topology/Sofa.Component.TopologyConfig.cmake.in index 0cb81dd4e5f..3b880e8bbd6 100644 --- a/Sofa/Component/Topology/Sofa.Component.TopologyConfig.cmake.in +++ b/Sofa/Component/Topology/Sofa.Component.TopologyConfig.cmake.in @@ -5,8 +5,9 @@ set(SOFACOMPONENTTOPOLOGY_TARGETS @SOFACOMPONENTTOPOLOGY_TARGETS@) +find_package(Sofa.Config QUIET REQUIRED) foreach(target ${SOFACOMPONENTTOPOLOGY_TARGETS}) - find_package(${target} QUIET REQUIRED) + sofa_find_package(${target} QUIET REQUIRED) endforeach() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/Component/Topology/Utility/Sofa.Component.Topology.UtilityConfig.cmake.in b/Sofa/Component/Topology/Utility/Sofa.Component.Topology.UtilityConfig.cmake.in index 323c29496ff..67d91ec8b8d 100644 --- a/Sofa/Component/Topology/Utility/Sofa.Component.Topology.UtilityConfig.cmake.in +++ b/Sofa/Component/Topology/Utility/Sofa.Component.Topology.UtilityConfig.cmake.in @@ -3,12 +3,13 @@ @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) set(SOFA_COMPONENT_TOPOLOGY_UTILITY_HAVE_ZLIB @SOFA_COMPONENT_TOPOLOGY_UTILITY_HAVE_ZLIB@) if (SOFA_COMPONENT_TOPOLOGY_UTILITY_HAVE_ZLIB) - find_package(ZLIB QUIET REQUIRED) + sofa_find_package(ZLIB QUIET REQUIRED) endif() if(NOT TARGET @PROJECT_NAME@) diff --git a/Sofa/Component/Visual/Sofa.Component.VisualConfig.cmake.in b/Sofa/Component/Visual/Sofa.Component.VisualConfig.cmake.in index 4d22bdfe3d4..af1e9f571c4 100644 --- a/Sofa/Component/Visual/Sofa.Component.VisualConfig.cmake.in +++ b/Sofa/Component/Visual/Sofa.Component.VisualConfig.cmake.in @@ -3,8 +3,9 @@ @PACKAGE_GUARD@ @PACKAGE_INIT@ -find_package(Sofa.Simulation.Core 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.Grid QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") From 1863aafd28fd12aac3b7bc031a9c803db42a84aa Mon Sep 17 00:00:00 2001 From: Frederick Roy Date: Wed, 16 Jul 2025 08:18:39 +0900 Subject: [PATCH 3/4] even faster with global keyword at project scale --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16fde6b8235..18d1d8e80a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 06) From 23ead1b2fae5fc014092bdb3e2dc57555cf4b0c9 Mon Sep 17 00:00:00 2001 From: Frederick Roy Date: Wed, 16 Jul 2025 16:30:01 +0900 Subject: [PATCH 4/4] Update Sofa.TypeConfig.cmake.in --- Sofa/framework/Type/Sofa.TypeConfig.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sofa/framework/Type/Sofa.TypeConfig.cmake.in b/Sofa/framework/Type/Sofa.TypeConfig.cmake.in index a716fe6d815..181de837d2a 100644 --- a/Sofa/framework/Type/Sofa.TypeConfig.cmake.in +++ b/Sofa/framework/Type/Sofa.TypeConfig.cmake.in @@ -5,8 +5,8 @@ set(SOFA_TYPE_HAVE_SOFA_COMPAT "@SOFA_TYPE_HAVE_SOFA_COMPAT@") -sofa_find_package(Sofa.Config QUIET REQUIRED) -find_package(Boost QUIET REQUIRED) +find_package(Sofa.Config QUIET REQUIRED) +sofa_find_package(Boost QUIET REQUIRED) if(SOFA_TYPE_HAVE_SOFA_COMPAT) sofa_find_package(Sofa.Compat QUIET REQUIRED)