blob: 9984dd9c62860653d3c3ca69c4f78a9ca12b672b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
From 0c00d0a84762b0e5f5fe4b53d5b8fa6e839334de Mon Sep 17 00:00:00 2001
From: Sergey Avseyev <sergey.avseyev@gmail.com>
Date: Thu, 20 Jun 2019 10:22:03 +0300
Subject: [PATCH 2/2] Fix test SO resolution
Change-Id: I00d817381061a4ec06fcc86925eec2d1daf8c7d8
---
cmake/Modules/GenerateConfigDotH.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/Modules/GenerateConfigDotH.cmake b/cmake/Modules/GenerateConfigDotH.cmake
index a919be33..aee77cb1 100644
--- a/cmake/Modules/GenerateConfigDotH.cmake
+++ b/cmake/Modules/GenerateConfigDotH.cmake
@@ -38,7 +38,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
OUTPUT_VARIABLE LIBM_SO_TRACE
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
- STRING(REGEX MATCH [-_a-z0-9/]+libm.so[.0-9]* LIBM_SO_PATH ${LIBM_SO_TRACE})
+ STRING(REGEX MATCH [-_a-z0-9/]+libm.so[.0-9]+ LIBM_SO_PATH ${LIBM_SO_TRACE})
IF (EXISTS "${LIBM_SO_PATH}")
GET_FILENAME_COMPONENT(CMAKE_TEST_SHARED_OBJECT ${LIBM_SO_PATH} NAME)
ENDIF()
--
2.22.0
|