songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7371 from lrineau/Surface_mesh_parameterization-fix_Suitesparse_in_Config_mode-GF 

Fix the use of SuiteSparse from vcpkg
This commit is contained in:
Laurent Rineau 2023-04-17 10:13:44 +02:00
parent f9c58a63db 0a84c4a131
commit 63e9d92b3c
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
View File

@ -24,21 +24,19 @@ if(TARGET CGAL::Eigen3_support)
if(SuiteSparse_FOUND) if(SuiteSparse_FOUND)
include_directories(${SuiteSparse_INCLUDE_DIRS}) include_directories(${SuiteSparse_INCLUDE_DIRS})
endif(SuiteSparse_FOUND) endif(SuiteSparse_FOUND)
else(NOT SuiteSparse_FOUND)
include(${USE_SuiteSparse})
endif(NOT SuiteSparse_FOUND) endif(NOT SuiteSparse_FOUND)
if(SuiteSparse_FOUND) if(SuiteSparse_FOUND)
if(SuiteSparse_UMFPACK_FOUND) if(SuiteSparse_UMFPACK_FOUND OR TARGET SuiteSparse::umfpack)
message(STATUS "SuiteSparse_LIBS: ${SuiteSparse_LIBRARIES}") message(STATUS "SuiteSparse_LIBS: ${SuiteSparse_LIBRARIES}")
message(STATUS "Orbifold Tutte Embeddings will use UmfPackLU") message(STATUS "Orbifold Tutte Embeddings will use UmfPackLU")
add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY) add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
add_definitions(-DCGAL_SMP_USE_SPARSESUITE_SOLVERS) add_definitions(-DCGAL_SMP_USE_SUITESPARSE_SOLVERS)
else() else()
message(STATUS "NOTICE: The example `orbifold.cpp` will be compiled without the Sparsesuite library and UmfPack. Try setting SuiteSparse_UMF_INCLUDE_DIR and at least one of SuiteSparse_UMFPACK_LIBRARY_RELEASE and SuiteSparse_UMFPACK_LIBRARY_DEBUG to you UMFPACK installation.") message(STATUS "NOTICE: The example `orbifold.cpp` will be compiled without the SuiteSparse library and UmfPack. Try setting SuiteSparse_UMF_INCLUDE_DIR and at least one of SuiteSparse_UMFPACK_LIBRARY_RELEASE and SuiteSparse_UMFPACK_LIBRARY_DEBUG to you UMFPACK installation.")
endif() endif()
else(SuiteSparse_FOUND) else(SuiteSparse_FOUND)
message(STATUS "NOTICE: The example `orbifold.cpp` will be compiled without the Sparsesuite library.") message(STATUS "NOTICE: The example `orbifold.cpp` will not be compiled without the SuiteSparse library.")
endif(SuiteSparse_FOUND) endif(SuiteSparse_FOUND)
# ------------------------------------------------------------------ # ------------------------------------------------------------------

6
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
View File

@ -33,7 +33,7 @@
#if defined(CGAL_EIGEN3_ENABLED) #if defined(CGAL_EIGEN3_ENABLED)
#include <CGAL/Eigen_solver_traits.h> #include <CGAL/Eigen_solver_traits.h>
#ifdef CGAL_SMP_USE_SPARSESUITE_SOLVERS #ifdef CGAL_SMP_USE_SUITESPARSE_SOLVERS
#include <Eigen/UmfPackSupport> #include <Eigen/UmfPackSupport>
#endif #endif
#endif #endif
@ -154,7 +154,7 @@ namespace Surface_mesh_parameterization {
/// CGAL::Eigen_solver_traits< /// CGAL::Eigen_solver_traits<
/// Eigen::SparseLU<Eigen_sparse_matrix<double>::EigenType> > /// Eigen::SparseLU<Eigen_sparse_matrix<double>::EigenType> >
/// \endcode /// \endcode
/// Moreover, if SparseSuite solvers are available, which is greatly preferable for speed, /// Moreover, if SuiteSparse solvers are available, which is greatly preferable for speed,
/// then the default parameter is: /// then the default parameter is:
/// \code /// \code
/// CGAL::Eigen_solver_traits< /// CGAL::Eigen_solver_traits<
@ -183,7 +183,7 @@ public:
typedef typename Default::Get< typedef typename Default::Get<
SolverTraits_, SolverTraits_,
#if defined(CGAL_EIGEN3_ENABLED) #if defined(CGAL_EIGEN3_ENABLED)
#ifdef CGAL_SMP_USE_SPARSESUITE_SOLVERS #ifdef CGAL_SMP_USE_SUITESPARSE_SOLVERS
CGAL::Eigen_solver_traits< CGAL::Eigen_solver_traits<
Eigen::UmfPackLU<Eigen_sparse_matrix<double>::EigenType> > Eigen::UmfPackLU<Eigen_sparse_matrix<double>::EigenType> >
#else #else

6
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h
View File

@ -33,7 +33,7 @@
#if defined(CGAL_EIGEN3_ENABLED) #if defined(CGAL_EIGEN3_ENABLED)
#include <CGAL/Eigen_solver_traits.h> #include <CGAL/Eigen_solver_traits.h>
#ifdef CGAL_SMP_USE_SPARSESUITE_SOLVERS #ifdef CGAL_SMP_USE_SUITESPARSE_SOLVERS
#include <Eigen/UmfPackSupport> #include <Eigen/UmfPackSupport>
#endif #endif
#endif #endif
@ -368,7 +368,7 @@ bool locate_unordered_cones(const SeamMesh& mesh,
/// CGAL::Eigen_solver_traits< /// CGAL::Eigen_solver_traits<
/// Eigen::SparseLU<Eigen_sparse_matrix<double>::EigenType> > /// Eigen::SparseLU<Eigen_sparse_matrix<double>::EigenType> >
/// \endcode /// \endcode
/// Moreover, if SparseSuite solvers are available, which is greatly preferable for speed, /// Moreover, if SuiteSparse solvers are available, which is greatly preferable for speed,
/// then the default parameter is: /// then the default parameter is:
/// \code /// \code
/// CGAL::Eigen_solver_traits< /// CGAL::Eigen_solver_traits<
@ -391,7 +391,7 @@ public:
typedef typename Default::Get< typedef typename Default::Get<
SolverTraits_, SolverTraits_,
#if defined(CGAL_EIGEN3_ENABLED) #if defined(CGAL_EIGEN3_ENABLED)
#ifdef CGAL_SMP_USE_SPARSESUITE_SOLVERS #ifdef CGAL_SMP_USE_SUITESPARSE_SOLVERS
CGAL::Eigen_solver_traits< CGAL::Eigen_solver_traits<
Eigen::UmfPackLU<Eigen_sparse_matrix<double>::EigenType> > Eigen::UmfPackLU<Eigen_sparse_matrix<double>::EigenType> >
#else #else