Date: Tuesday, November 22, 2022 @ 15:51:27
Author: svenstaro
Revision: 1351800
upgpkg: ceres-solver 2.1.0-3
Added:
ceres-solver/trunk/0001-fix-for-suitesparse-6.0.0.patch
--------------------------------------+
0001-fix-for-suitesparse-6.0.0.patch | 54 +++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
Added: 0001-fix-for-suitesparse-6.0.0.patch
===================================================================
--- 0001-fix-for-suitesparse-6.0.0.patch (rev 0)
+++ 0001-fix-for-suitesparse-6.0.0.patch 2022-11-22 15:51:27 UTC (rev
1351800)
@@ -0,0 +1,54 @@
+diff --git a/cmake/FindSuiteSparse.cmake b/cmake/FindSuiteSparse.cmake
+index 4e05930..0e3a10b 100644
+--- a/cmake/FindSuiteSparse.cmake
++++ b/cmake/FindSuiteSparse.cmake
+@@ -404,26 +404,36 @@
+ else (NOT EXISTS ${SuiteSparse_VERSION_FILE})
+ file(READ ${SuiteSparse_VERSION_FILE} Config_CONTENTS)
+
+- string(REGEX MATCH "#define SUITESPARSE_MAIN_VERSION [0-9]+"
+- SuiteSparse_VERSION_MAJOR "${Config_CONTENTS}")
+- string(REGEX REPLACE "#define SUITESPARSE_MAIN_VERSION ([0-9]+)" "\\1"
+- SuiteSparse_VERSION_MAJOR "${SuiteSparse_VERSION_MAJOR}")
++ string(REGEX MATCH "#define SUITESPARSE_MAIN_VERSION[ \t]+([0-9]+)"
++ SuiteSparse_VERSION_LINE "${Config_CONTENTS}")
++ set (SuiteSparse_VERSION_MAJOR ${CMAKE_MATCH_1})
+
+- string(REGEX MATCH "#define SUITESPARSE_SUB_VERSION [0-9]+"
+- SuiteSparse_VERSION_MINOR "${Config_CONTENTS}")
+- string(REGEX REPLACE "#define SUITESPARSE_SUB_VERSION ([0-9]+)" "\\1"
+- SuiteSparse_VERSION_MINOR "${SuiteSparse_VERSION_MINOR}")
++ string(REGEX MATCH "#define SUITESPARSE_SUB_VERSION[ \t]+([0-9]+)"
++ SuiteSparse_VERSION_LINE "${Config_CONTENTS}")
++ set (SuiteSparse_VERSION_MINOR ${CMAKE_MATCH_1})
+
+- string(REGEX MATCH "#define SUITESPARSE_SUBSUB_VERSION [0-9]+"
+- SuiteSparse_VERSION_PATCH "${Config_CONTENTS}")
+- string(REGEX REPLACE "#define SUITESPARSE_SUBSUB_VERSION ([0-9]+)" "\\1"
+- SuiteSparse_VERSION_PATCH "${SuiteSparse_VERSION_PATCH}")
++ string(REGEX MATCH "#define SUITESPARSE_SUBSUB_VERSION[ \t]+([0-9]+)"
++ SuiteSparse_VERSION_LINE "${Config_CONTENTS}")
++ set (SuiteSparse_VERSION_PATCH ${CMAKE_MATCH_1})
++
++ unset (SuiteSparse_VERSION_LINE)
+
+ # This is on a single line s/t CMake does not interpret it as a list of
+ # elements and insert ';' separators which would result in 4.;2.;1
nonsense.
+ set(SuiteSparse_VERSION
+
"${SuiteSparse_VERSION_MAJOR}.${SuiteSparse_VERSION_MINOR}.${SuiteSparse_VERSION_PATCH}")
+- set(SuiteSparse_VERSION_COMPONENTS 3)
++
++ if (SuiteSparse_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
++ set(SuiteSparse_VERSION_COMPONENTS 3)
++ else (SuiteSparse_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
++ message (WARNING "Could not parse SuiteSparse_config.h: SuiteSparse "
++ "version will not be available")
++
++ unset (SuiteSparse_VERSION)
++ unset (SuiteSparse_VERSION_MAJOR)
++ unset (SuiteSparse_VERSION_MINOR)
++ unset (SuiteSparse_VERSION_PATCH)
++ endif (SuiteSparse_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
+ endif (NOT EXISTS ${SuiteSparse_VERSION_FILE})
+ endif (TARGET SuiteSparse::Config)
+
