mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

[#3065] addressing review comments

Browse Source
This commit is contained in:
Piotrek Zadroga 2023-10-04 16:55:31 +02:00
parent c6467358e7
commit dd1a2d5b88
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
m4macros/ax_gtest.m4
View File

@ -74,24 +74,24 @@ if test "x$enable_gtest" = "xyes" ; then
GTEST_SOURCE= GTEST_SOURCE=
for d in /usr/src/googletest /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do for d in /usr/src/googletest /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do
cmakelists="$d/CMakeLists.txt" cmakelists="$d/CMakeLists.txt"
if test ! -d "$d"/src -a -d "$d"/googletest; then if test ! -d "$d/src" -a -d "$d/googletest"; then
d=$d/googletest d="$d/googletest"
fi fi
if test -f $d/src/gtest-all.cc -a -f $d/src/gtest_main.cc; then if test -f "$d/src/gtest-all.cc" -a -f "$d/src/gtest_main.cc"; then
GTEST_SOURCE=$d GTEST_SOURCE="$d"
AC_MSG_RESULT([$GTEST_SOURCE]) AC_MSG_RESULT([$GTEST_SOURCE])
break break
fi fi
done done
if test -z $GTEST_SOURCE ; then if test -z "$GTEST_SOURCE" ; then
AC_MSG_ERROR([no gtest sources found]) AC_MSG_ERROR([no gtest sources found])
fi fi
else else
cmakelists="$GTEST_SOURCE/CMakeLists.txt" cmakelists="$GTEST_SOURCE/CMakeLists.txt"
if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then if test ! -d "$GTEST_SOURCE/src" -a -d "$GTEST_SOURCE/googletest"; then
GTEST_SOURCE=$GTEST_SOURCE/googletest GTEST_SOURCE="$GTEST_SOURCE/googletest"
fi fi
if test -f $GTEST_SOURCE/src/gtest-all.cc -a -f $GTEST_SOURCE/src/gtest_main.cc; then if test -f "$GTEST_SOURCE/src/gtest-all.cc" -a -f "$GTEST_SOURCE/src/gtest_main.cc"; then
AC_MSG_RESULT([$GTEST_SOURCE]) AC_MSG_RESULT([$GTEST_SOURCE])
else else
AC_MSG_ERROR([no gtest source at $GTEST_SOURCE]) AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])
@ -123,12 +123,12 @@ 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.
if test -f "$cmakelists" ; then if test -f "$cmakelists" ; then
gtest_version_candidate=$(< "$cmakelists" grep -F 'set(GOOGLETEST_VERSION' | grep -Eo '[[0-9]+\.[0-9]+\.[0-9]+]') gtest_version_candidate=$(grep -F 'set(GOOGLETEST_VERSION' "$cmakelists" | grep -Eo '[[0-9]+\.[0-9]+\.[0-9]+]')
if test -n "$gtest_version_candidate"; then if test -n "$gtest_version_candidate"; then
GTEST_VERSION=$gtest_version_candidate GTEST_VERSION="$gtest_version_candidate"
fi fi
fi fi
if test $GTEST_VERSION = "unknown" ; then if test "$GTEST_VERSION" = "unknown" ; then
# Try to get googletest version from debian/ubuntu package # Try to get googletest version from debian/ubuntu package
AC_PATH_PROG(DPKG, dpkg) AC_PATH_PROG(DPKG, dpkg)
AC_PATH_PROG(DPKGQUERY, dpkg-query) AC_PATH_PROG(DPKGQUERY, dpkg-query)
@ -141,7 +141,7 @@ if test "x$enable_gtest" = "xyes" ; then
fi fi
fi fi
else else
GTEST_VERSION=$gtest_version_candidate GTEST_VERSION="$gtest_version_candidate"
fi fi
fi fi