summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--development/gtest/gtest.SlackBuild18
-rw-r--r--development/gtest/gtest.info6
2 files changed, 13 insertions, 11 deletions
diff --git a/development/gtest/gtest.SlackBuild b/development/gtest/gtest.SlackBuild
index f361293d30..c244e93172 100644
--- a/development/gtest/gtest.SlackBuild
+++ b/development/gtest/gtest.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=gtest
SRCNAM=googletest
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.8.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -84,20 +84,22 @@ cd build
make
cd ..
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include/$PRGNAM/internal
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include/$PRGNAM/internal/custom \
+ $PKG/usr/include/gmock/internal/custom
-install -m 0644 build/*.so $PKG/usr/lib$LIBDIRSUFFIX
-install -m 0644 include/$PRGNAM/*.h $PKG/usr/include/$PRGNAM
-install -m 0644 include/$PRGNAM/internal/*.h $PKG/usr/include/$PRGNAM/internal
+install -m 0644 build/googlemock/*.so $PKG/usr/lib$LIBDIRSUFFIX
+install -m 0644 googlemock/include/gmock/*.h $PKG/usr/include/gmock
+install -m 0644 googlemock/include/gmock/internal/custom/*.h $PKG/usr/include/gmock/internal/custom
+
+install -m 0644 build/googlemock/$PRGNAM/*.so $PKG/usr/lib$LIBDIRSUFFIX
+install -m 0644 googletest/include/$PRGNAM/*.h $PKG/usr/include/$PRGNAM/
+install -m 0644 googletest/include/$PRGNAM/internal/custom/*.h $PKG/usr/include/$PRGNAM/internal/custom
-# Strip binaries and libraries
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-# Make the package; be sure to leave it in $OUTPUT
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/gtest/gtest.info b/development/gtest/gtest.info
index 28e232ec5b..e0744bd682 100644
--- a/development/gtest/gtest.info
+++ b/development/gtest/gtest.info
@@ -1,8 +1,8 @@
PRGNAM="gtest"
-VERSION="1.7.0"
+VERSION="1.8.0"
HOMEPAGE="https://github.com/google/googletest"
-DOWNLOAD="https://github.com/google/googletest/archive/release-1.7.0.tar.gz"
-MD5SUM="4ff6353b2560df0afecfbda3b2763847"
+DOWNLOAD="https://github.com/google/googletest/archive/release-1.8.0.tar.gz"
+MD5SUM="16877098823401d1bf2ed7891d7dce36"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""