From 11e64b34c2007321425c5e3d7474101b20409270 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 6 Apr 2023 18:00:05 +0200 Subject: [PATCH 1/3] Fix the use of SuiteSparse from vcpkg --- .../examples/Surface_mesh_parameterization/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index 988f875425e..0af99a9cefa 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -24,12 +24,10 @@ if(TARGET CGAL::Eigen3_support) if(SuiteSparse_FOUND) include_directories(${SuiteSparse_INCLUDE_DIRS}) endif(SuiteSparse_FOUND) - else(NOT SuiteSparse_FOUND) - include(${USE_SuiteSparse}) endif(NOT 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 "Orbifold Tutte Embeddings will use UmfPackLU") add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY) @@ -38,7 +36,7 @@ if(TARGET CGAL::Eigen3_support) 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.") endif() 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 Sparsesuite library.") endif(SuiteSparse_FOUND) # ------------------------------------------------------------------ From bcf31d6ed65caa70038a8655864c9a20806f0dd6 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 11 Apr 2023 12:52:20 +0200 Subject: [PATCH 2/3] fix typo --- .../examples/Surface_mesh_parameterization/CMakeLists.txt | 4 ++-- .../CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h | 2 +- .../Orbifold_Tutte_parameterizer_3.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index 0af99a9cefa..83fbbca1403 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -33,10 +33,10 @@ if(TARGET CGAL::Eigen3_support) add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY) add_definitions(-DCGAL_SMP_USE_SPARSESUITE_SOLVERS) 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() else(SuiteSparse_FOUND) - message(STATUS "NOTICE: The example `orbifold.cpp` will not be compiled without the Sparsesuite library.") + message(STATUS "NOTICE: The example `orbifold.cpp` will not be compiled without the SuiteSparse library.") endif(SuiteSparse_FOUND) # ------------------------------------------------------------------ diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h index 676d6f951a2..fc433814e05 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h @@ -154,7 +154,7 @@ namespace Surface_mesh_parameterization { /// CGAL::Eigen_solver_traits< /// Eigen::SparseLU::EigenType> > /// \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: /// \code /// CGAL::Eigen_solver_traits< diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h index 32ab1511ca8..85d0d183717 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h @@ -368,7 +368,7 @@ bool locate_unordered_cones(const SeamMesh& mesh, /// CGAL::Eigen_solver_traits< /// Eigen::SparseLU::EigenType> > /// \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: /// \code /// CGAL::Eigen_solver_traits< From 0a84c4a1315b67b0ce53b5ad58362297a10e4e16 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 11 Apr 2023 14:46:36 +0200 Subject: [PATCH 3/3] rename the macro as well --- .../examples/Surface_mesh_parameterization/CMakeLists.txt | 2 +- .../CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h | 4 ++-- .../Orbifold_Tutte_parameterizer_3.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index 83fbbca1403..0ae9468f45c 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -31,7 +31,7 @@ if(TARGET CGAL::Eigen3_support) message(STATUS "SuiteSparse_LIBS: ${SuiteSparse_LIBRARIES}") message(STATUS "Orbifold Tutte Embeddings will use UmfPackLU") add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY) - add_definitions(-DCGAL_SMP_USE_SPARSESUITE_SOLVERS) + add_definitions(-DCGAL_SMP_USE_SUITESPARSE_SOLVERS) else() 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() diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h index fc433814e05..ca3de476091 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h @@ -33,7 +33,7 @@ #if defined(CGAL_EIGEN3_ENABLED) #include -#ifdef CGAL_SMP_USE_SPARSESUITE_SOLVERS +#ifdef CGAL_SMP_USE_SUITESPARSE_SOLVERS #include #endif #endif @@ -183,7 +183,7 @@ public: typedef typename Default::Get< SolverTraits_, #if defined(CGAL_EIGEN3_ENABLED) - #ifdef CGAL_SMP_USE_SPARSESUITE_SOLVERS + #ifdef CGAL_SMP_USE_SUITESPARSE_SOLVERS CGAL::Eigen_solver_traits< Eigen::UmfPackLU::EigenType> > #else diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h index 85d0d183717..6d109671f29 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h @@ -33,7 +33,7 @@ #if defined(CGAL_EIGEN3_ENABLED) #include -#ifdef CGAL_SMP_USE_SPARSESUITE_SOLVERS +#ifdef CGAL_SMP_USE_SUITESPARSE_SOLVERS #include #endif #endif @@ -391,7 +391,7 @@ public: typedef typename Default::Get< SolverTraits_, #if defined(CGAL_EIGEN3_ENABLED) - #ifdef CGAL_SMP_USE_SPARSESUITE_SOLVERS + #ifdef CGAL_SMP_USE_SUITESPARSE_SOLVERS CGAL::Eigen_solver_traits< Eigen::UmfPackLU::EigenType> > #else