Fix Z3 version detection regexp

[stilriv]

Summary

regexp for try_run path expects '0 or more' digits which is incorrect because it should be 'one or more', regexp for header parsing expects 'exactly one' digit which is incorrect with current Z3 version (4.11.2)

[mikhail.ramalho]

LGTM.

[stilriv]

Thank you!
Could you commit it for me please?

[mikhail.ramalho]

In D134261#3806590, @stilriv wrote:

Thank you!
Could you commit it for me please?

sure, what's the name and email you want to be associated with the commit? Otherwise, I can add a "Patch by: stilriv (Mikhail Korolev)" to the commit message.

[stilriv]

Mikhail Korolev [e-mail]

[stilriv]

side note: I'd like to make one more change to this file a bit later to improve UX in cross builds -- will you be available for review?

[mikhail.ramalho]

sure, I'll be getting emails now.

Em sex., 23 de set. de 2022 às 16:03, Mikhail Korolev via Phabricator <
[e-mail]> escreveu:

stilriv added a comment.

side note: I'd like to make one more change to this file a bit later to
improve UX in cross builds -- will you be available for review?

Repository:

rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION

https://reviews.llvm.org/D134261/new/

https://reviews.llvm.org/D134261

llvm/cmake/modules/FindZ3.cmake

try_run(
     ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testz3.cpp
     COMPILE_DEFINITIONS -I"${z3_include}"
     LINK_LIBRARIES ${z3_link_libs}
     COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT
     RUN_OUTPUT_VARIABLE SRC_OUTPUT
   )
 
   if(Z3_COMPILED)
-    string(REGEX REPLACE "([0-9]*\\.[0-9]*\\.[0-9]*)" "\\1"
+    string(REGEX REPLACE "([0-9]+\\.[0-9]+\\.[0-9]+)" "\\1"
            z3_version "${SRC_OUTPUT}")
     set(Z3_VERSION_STRING ${z3_version} PARENT_SCOPE)
   else()
     message(NOTICE "${COMPILE_OUTPUT}")
     message(WARNING "Failed to compile Z3 program that is used to determine library version.")
   endif()
 endfunction(check_z3_version)
 

 if(NOT Z3_VERSION_STRING AND (CMAKE_CROSSCOMPILING AND
                               Z3_INCLUDE_DIR AND
                               EXISTS "${Z3_INCLUDE_DIR}/z3_version.h"))
   # TODO: print message warning that we couldn't find a compatible lib?
 
   # Z3 4.8.1+ has the version is in a public header.
   file(STRINGS "${Z3_INCLUDE_DIR}/z3_version.h"
        z3_version_str REGEX "^#define[\t ]+Z3_MAJOR_VERSION[\t ]+.*")
-  string(REGEX REPLACE "^.*Z3_MAJOR_VERSION[\t ]+([0-9]).*$" "\\1"
+  string(REGEX REPLACE "^.*Z3_MAJOR_VERSION[\t ]+([0-9]+).*$" "\\1"
          Z3_MAJOR "${z3_version_str}")
 
   file(STRINGS "${Z3_INCLUDE_DIR}/z3_version.h"
        z3_version_str REGEX "^#define[\t ]+Z3_MINOR_VERSION[\t ]+.*")
-  string(REGEX REPLACE "^.*Z3_MINOR_VERSION[\t ]+([0-9]).*$" "\\1"
+  string(REGEX REPLACE "^.*Z3_MINOR_VERSION[\t ]+([0-9]+).*$" "\\1"
          Z3_MINOR "${z3_version_str}")
 
   file(STRINGS "${Z3_INCLUDE_DIR}/z3_version.h"
        z3_version_str REGEX "^#define[\t ]+Z3_BUILD_NUMBER[\t ]+.*")
-  string(REGEX REPLACE "^.*Z3_BUILD_NUMBER[\t ]+([0-9]).*$" "\\1"
+  string(REGEX REPLACE "^.*Z3_BUILD_NUMBER[\t ]+([0-9]+).*$" "\\1"
          Z3_BUILD "${z3_version_str}")
 
   set(Z3_VERSION_STRING ${Z3_MAJOR}.${Z3_MINOR}.${Z3_BUILD})
   unset(z3_version_str)
 endif()
 
 if(NOT Z3_VERSION_STRING)
   # Give up: we are unable to obtain a version of the Z3 library. Be