1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 12:10:03 +00:00

Use ninja instead of make in build.

This commit is contained in:
Brenden Matthews 2022-12-25 08:21:38 -05:00 committed by Brenden Matthews
parent 15aa99836b
commit 558891aab5
4 changed files with 19 additions and 15 deletions

View File

@ -86,6 +86,7 @@ jobs:
libxmmsclient-dev \
libxnvctrl-dev \
ncurses-dev \
ninja \
wayland-protocols
- name: Install libc++
if: matrix.compiler == 'clang'
@ -112,7 +113,7 @@ jobs:
mkdir build
cd build
cmake .. \
cmake .. -G Ninja \
-DBUILD_AUDACIOUS=ON \
-DBUILD_HTTP=ON \
-DBUILD_ICAL=ON \
@ -137,7 +138,7 @@ jobs:
-DMAINTAINER_MODE=ON
- name: Compile
working-directory: build
run: make -j5
run: ninja
- name: Test
working-directory: build
run: make test
run: ninja test

View File

@ -22,7 +22,8 @@ jobs:
librsvg \
libxft \
libxinerama \
lua
lua \
ninja
- name: Checkout
uses: actions/checkout@v3
- name: Configure with CMake
@ -30,13 +31,13 @@ jobs:
set -x
mkdir build
cd build
cmake .. \
cmake .. -G Ninja \
-DMAINTAINER_MODE=ON \
-DBUILD_WAYLAND=OFF \
-DBUILD_TESTS=ON
- name: Compile
working-directory: build
run: make -j5
run: ninja
- name: Test
working-directory: build
run: make test
run: ninja test

View File

@ -37,6 +37,7 @@ RUN apt-get update \
libxmmsclient-dev \
libxnvctrl-dev \
make \
ninja \
patch \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
@ -59,7 +60,7 @@ WORKDIR /conky/build
ARG X11=yes
RUN sh -c 'if [ "$X11" = "yes" ] ; then \
cmake \
cmake -G Ninja \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_INSTALL_PREFIX=/opt/conky \
@ -81,7 +82,7 @@ RUN sh -c 'if [ "$X11" = "yes" ] ; then \
-DBUILD_XMMS2=ON \
../ \
; else \
cmake \
cmake -G Ninja \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_INSTALL_PREFIX=/opt/conky \
@ -103,8 +104,8 @@ RUN sh -c 'if [ "$X11" = "yes" ] ; then \
-DBUILD_XMMS2=ON \
../ \
; fi' \
&& make -j5 all \
&& make -j5 install
&& ninja \
&& ninja install
FROM ubuntu:jammy

View File

@ -30,7 +30,7 @@ pushd "$BUILD_DIR"
# configure build files with cmake
# we need to explicitly set the install prefix, as CMake's default is /usr/local for some reason...
cmake \
cmake -G Ninja \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DRELEASE=ON \
-DBUILD_AUDACIOUS=ON \
@ -53,11 +53,12 @@ cmake \
-DBUILD_X11=ON \
-DBUILD_XMMS2=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
"$REPO_ROOT"
"$REPO_ROOT" \
--target install -- DESTDIR=AppDir
# build project and install files into AppDir
make -j4
make install DESTDIR=AppDir
ninja
ninja install
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage