mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-08-29 13:07:50 +00:00
[#3065] modify semver regex
This commit is contained in:
parent
1d9712eb1b
commit
fbe5b52f47
@ -113,6 +113,7 @@ if test "x$enable_gtest" = "xyes" ; then
|
|||||||
# If the GTEST_VERSION is still not correct semver, we need to determine googletest version in other way.
|
# If the GTEST_VERSION is still not correct semver, we need to determine googletest version in other way.
|
||||||
# Let's try to extract it from CMake build script used by Google Test starting from version 1.8.0.
|
# Let's try to extract it from CMake build script used by Google Test starting from version 1.8.0.
|
||||||
semverRegex='.*\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+\).*'
|
semverRegex='.*\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+\).*'
|
||||||
|
semverRegex='.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*'
|
||||||
gtest_version_candidate=
|
gtest_version_candidate=
|
||||||
gtest_version_candidate=$(expr "$GTEST_VERSION" : "$semverRegex")
|
gtest_version_candidate=$(expr "$GTEST_VERSION" : "$semverRegex")
|
||||||
gtest_version_found="no"
|
gtest_version_found="no"
|
||||||
@ -129,6 +130,7 @@ if test "x$enable_gtest" = "xyes" ; then
|
|||||||
GTEST_VERSION=$gtest_version_candidate
|
GTEST_VERSION=$gtest_version_candidate
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
dpkg -l googletest libgtest-dev 2>/dev/null
|
||||||
# Try to get googletest version from debian/ubuntu package
|
# Try to get googletest version from debian/ubuntu package
|
||||||
dpkg -S "$GTEST_SOURCE" | cut -d':' -f1 &> /dev/null
|
dpkg -S "$GTEST_SOURCE" | cut -d':' -f1 &> /dev/null
|
||||||
if test $? -eq 0; then
|
if test $? -eq 0; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user