From 676600e92da6e8f9d405fa8961a08e0cd0a13b44 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 3 Feb 2024 14:51:39 +0100 Subject: [PATCH] Build benchmarks on arch/alpine --- Dockerfile-build-alpine | 3 ++- Dockerfile-build-arch | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile-build-alpine b/Dockerfile-build-alpine index aef34b78..02c18010 100644 --- a/Dockerfile-build-alpine +++ b/Dockerfile-build-alpine @@ -15,6 +15,7 @@ ARG LMS_BUILD_PACKAGES=" \ gcc \ g++ \ musl-dev \ + benchmark-dev \ boost-dev \ ffmpeg-dev \ libarchive-dev \ @@ -35,7 +36,7 @@ ARG LMS_BUILD_TYPE="Release" RUN \ DIR=/tmp/lms/build && mkdir -p ${DIR} && cd ${DIR} && \ xx-info is-cross && export BUILD_TESTS=OFF || export BUILD_TESTS=ON && \ - PKG_CONFIG_PATH=/$(xx-info)/usr/lib/pkgconfig cmake /tmp/lms/ -DCMAKE_INCLUDE_PATH=${PREFIX}/include -DCMAKE_BUILD_TYPE=${LMS_BUILD_TYPE} $(xx-clang --print-cmake-defines) -DCMAKE_PREFIX_PATH=/$(xx-info)/usr/lib/cmake -DBUILD_TESTING=${BUILD_TESTS} && \ + PKG_CONFIG_PATH=/$(xx-info)/usr/lib/pkgconfig cmake /tmp/lms/ -DCMAKE_INCLUDE_PATH=${PREFIX}/include -DCMAKE_BUILD_TYPE=${LMS_BUILD_TYPE} $(xx-clang --print-cmake-defines) -DCMAKE_PREFIX_PATH=/$(xx-info)/usr/lib/cmake -DBUILD_TESTING=${BUILD_TESTS} -DBUILD_BENCHMARKS=ON && \ VERBOSE=1 make -j$(nproc) && \ xx-verify src/lms/lms && \ (xx-info is-cross || make test) diff --git a/Dockerfile-build-arch b/Dockerfile-build-arch index 14eeac08..82cc3ee0 100644 --- a/Dockerfile-build-arch +++ b/Dockerfile-build-arch @@ -1,6 +1,7 @@ FROM archlinux:latest ARG BUILD_PACKAGES="\ + benchmark \ clang \ cmake \ boost \ @@ -22,6 +23,6 @@ COPY . /tmp/lms/ ARG LMS_BUILD_TYPE="Release" RUN \ DIR=/tmp/lms/build && mkdir -p ${DIR} && cd ${DIR} && \ - cmake /tmp/lms/ -DCMAKE_BUILD_TYPE=${LMS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/usr && \ + cmake /tmp/lms/ -DCMAKE_BUILD_TYPE=${LMS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_BENCHMARKS=ON && \ VERBOSE=1 make -j$(nproc) && \ make test