diff options
| author | Brad King <brad.king@kitware.com> | 2022-01-11 13:04:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-01-11 13:04:33 (GMT) |
| commit | ddc6be2c196fab3eedf5e243cb0fb387a52a4271 (patch) | |
| tree | bd1aac7dda81627d366a92bc269299e3fd45561f /Modules | |
| parent | a3a60620817ae9c1bc4f52e128acee23832b5b03 (diff) | |
| parent | 4ce5765a8605cf4aa0fbb01f77ae2bf764452ccd (diff) | |
| download | CMake-ddc6be2c196fab3eedf5e243cb0fb387a52a4271.zip CMake-ddc6be2c196fab3eedf5e243cb0fb387a52a4271.tar.gz CMake-ddc6be2c196fab3eedf5e243cb0fb387a52a4271.tar.bz2 | |
Merge topic 'FindLTTngUST-fix-version-detect'
4ce5765a86 FindLTTngUST: Fix version component extraction
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6828
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindLTTngUST.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindLTTngUST.cmake b/Modules/FindLTTngUST.cmake index f478e4d..a70a418 100644 --- a/Modules/FindLTTngUST.cmake +++ b/Modules/FindLTTngUST.cmake @@ -63,11 +63,11 @@ if(LTTNGUST_INCLUDE_DIRS AND LTTNGUST_LIBRARIES) REGEX "^[\t ]*#define[\t ]+LTTNG_UST_MINOR_VERSION[\t ]+[0-9]+[\t ]*$") file(STRINGS "${lttngust_version_file}" lttngust_version_patch_string REGEX "^[\t ]*#define[\t ]+LTTNG_UST_PATCHLEVEL_VERSION[\t ]+[0-9]+[\t ]*$") - string(REGEX REPLACE ".*([0-9]+).*" "\\1" + string(REGEX REPLACE ".*[\t ]+([0-9]+).*" "\\1" lttngust_v_major "${lttngust_version_major_string}") - string(REGEX REPLACE ".*([0-9]+).*" "\\1" + string(REGEX REPLACE ".*[\t ]+([0-9]+).*" "\\1" lttngust_v_minor "${lttngust_version_minor_string}") - string(REGEX REPLACE ".*([0-9]+).*" "\\1" + string(REGEX REPLACE ".*[\t ]+([0-9]+).*" "\\1" lttngust_v_patch "${lttngust_version_patch_string}") set(LTTNGUST_VERSION_STRING "${lttngust_v_major}.${lttngust_v_minor}.${lttngust_v_patch}") |