From 17b5c65a80b5da9fca082fc14df64a6557c38394 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Fri, 19 Sep 2025 10:42:35 +0300 Subject: [PATCH] Rebuild with googletest 1.17.0 --- pkg.info | 1 + source.sh | 17 +++++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkg.info b/pkg.info index 4865fb0..fac0f47 100644 --- a/pkg.info +++ b/pkg.info @@ -1,6 +1,7 @@ name: abseil-cpp description: Abseil Common Libraries (C++) version: 20250814.0 +revision: 2 url: https://abseil.io/ license: Apache-2.0 architecture: any diff --git a/source.sh b/source.sh index 998b216..7302542 100644 --- a/source.sh +++ b/source.sh @@ -15,31 +15,28 @@ prepare() { # The build function is executed in the source directory # This function is used to compile the source code build() { - mkdir build - cd build - - cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_SHARED_LIBS=ON \ -DABSL_BUILD_TESTING=ON \ -DABSL_USE_EXTERNAL_GOOGLETEST=ON \ -DABSL_FIND_GOOGLETEST=ON \ - -DABSL_USE_GOOGLETEST_HEAD=ON .. - make + -DABSL_USE_GOOGLETEST_HEAD=ON + cmake --build build } # The check function is executed in the source directory # This function is used to run tests to verify the package has been compiled correctly check() { - cd build - ctest + ctest --test-dir build } # The package function is executed in the source directory # This function is used to move the compiled files into the output directory package() { - cd build - make DESTDIR="$BPM_OUTPUT" install + DESTDIR="$BPM_OUTPUT" cmake --install build + # Install package license install -Dm644 "$BPM_SOURCE"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/abseil-cpp/LICENSE }