Commit 49f54387 authored by Julien Osman's avatar Julien Osman
Browse files

Merge branch '2274-muparser-version-detection' into 'release-8.0'

Correct regex to parse muparser version

See merge request !910
parents b4c55921 b70b232e
Pipeline #10467 passed with stages
in 126 minutes and 25 seconds
......@@ -47,7 +47,7 @@ if(EXISTS "${MUPARSER_INCLUDE_DIR}/muParserDef.h")
MUPARSER_VERSION_OLD_STYLE "${_muParserDef_h_CONTENTS}")
# Try to find the version for muparser >= 2.3
string(REGEX REPLACE ".*static *const *string_type *ParserVersion *= *string_type\\(_T\\(\"([0-9.]+)\"\\)\\);.*"
string(REGEX REPLACE ".*static *const *string_type *ParserVersion *= *string_type\\(_T\\(\"([0-9.]+)([^0-9.]+)?\"\\)\\);.*"
"\\1" MUPARSER_VERSION "${MUPARSER_VERSION_OLD_STYLE}")
if(MUPARSER_VERSION MATCHES "^[0-9]+\$")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment