diff options
Diffstat (limited to 'suitesparse-ver.patch')
| -rw-r--r-- | suitesparse-ver.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/suitesparse-ver.patch b/suitesparse-ver.patch new file mode 100644 index 000000000000..71b2d623ad54 --- /dev/null +++ b/suitesparse-ver.patch @@ -0,0 +1,35 @@ +diff --git a/cMake/FindCholmod.cmake b/cMake/FindCholmod.cmake +index 1c89225..7007d8b 100644 +--- a/cMake/FindCholmod.cmake ++++ b/cMake/FindCholmod.cmake +@@ -28,19 +28,19 @@ if (CHOLMOD_INCLUDE_DIR AND CHOLMOD_LIBRARIES) + else (NOT EXISTS ${SUITESPARSE_VERSION_FILE}) + file(READ ${SUITESPARSE_VERSION_FILE} SUITESPARSE_CONFIG_CONTENTS) + +- string(REGEX MATCH "#define SUITESPARSE_MAIN_VERSION [0-9]+" ++ string(REGEX MATCH "#define SUITESPARSE_MAIN_VERSION[ ]+[0-9]+" + SUITESPARSE_MAIN_VERSION "${SUITESPARSE_CONFIG_CONTENTS}") +- string(REGEX REPLACE "#define SUITESPARSE_MAIN_VERSION ([0-9]+)" "\\1" ++ string(REGEX REPLACE "#define SUITESPARSE_MAIN_VERSION[ ]+([0-9]+)" "\\1" + SUITESPARSE_MAIN_VERSION "${SUITESPARSE_MAIN_VERSION}") + +- string(REGEX MATCH "#define SUITESPARSE_SUB_VERSION [0-9]+" ++ string(REGEX MATCH "#define SUITESPARSE_SUB_VERSION[ ]+[0-9]+" + SUITESPARSE_SUB_VERSION "${SUITESPARSE_CONFIG_CONTENTS}") +- string(REGEX REPLACE "#define SUITESPARSE_SUB_VERSION ([0-9]+)" "\\1" ++ string(REGEX REPLACE "#define SUITESPARSE_SUB_VERSION[ ]+([0-9]+)" "\\1" + SUITESPARSE_SUB_VERSION "${SUITESPARSE_SUB_VERSION}") + +- string(REGEX MATCH "#define SUITESPARSE_SUBSUB_VERSION [0-9]+" ++ string(REGEX MATCH "#define SUITESPARSE_SUBSUB_VERSION[ ]+[0-9]+" + SUITESPARSE_SUBSUB_VERSION "${SUITESPARSE_CONFIG_CONTENTS}") +- string(REGEX REPLACE "#define SUITESPARSE_SUBSUB_VERSION ([0-9]+)" "\\1" ++ string(REGEX REPLACE "#define SUITESPARSE_SUBSUB_VERSION[ ]+([0-9]+)" "\\1" + SUITESPARSE_SUBSUB_VERSION "${SUITESPARSE_SUBSUB_VERSION}") + + set(SUITESPARSE_VERSION +@@ -57,4 +57,3 @@ endif ((SUITESPARSE_MAIN_VERSION GREATER 4) OR (SUITESPARSE_MAIN_VERSION EQUAL 4 + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cholmod DEFAULT_MSG CHOLMOD_LIBRARIES CHOLMOD_INCLUDE_DIR AMD_LIBRARY CAMD_LIBRARY COLAMD_LIBRARY CCOLAMD_LIBRARY SUITESPARSECONFIG_LIBRARY) + MARK_AS_ADVANCED(CHOLMOD_LIBRARIES CHOLMOD_INCLUDE_DIR AMD_LIBRARY CAMD_LIBRARY COLAMD_LIBRARY CCOLAMD_LIBRARY SUITESPARSECONFIG_LIBRARY) +- |