Use Ninja
This commit is contained in:
parent
0fd562af40
commit
e9e9b90bdb
@ -17,14 +17,14 @@ build() {
|
||||
|
||||
# Build ARM Components
|
||||
cd arm
|
||||
make -j$(nproc)
|
||||
make install DESTDIR="${prefix}"
|
||||
cmake --build .
|
||||
DESTDIR="${prefix}" cmake --install .
|
||||
cd ../
|
||||
|
||||
# Build Native Components
|
||||
cd native
|
||||
make -j$(nproc)
|
||||
make install DESTDIR="${prefix}"
|
||||
cmake --build .
|
||||
DESTDIR="${prefix}" cmake --install .
|
||||
cd ../
|
||||
|
||||
# Exit
|
||||
@ -45,8 +45,8 @@ armhf_build() {
|
||||
mkdir -p "${prefix}"
|
||||
|
||||
# Build All Components
|
||||
make -j$(nproc)
|
||||
make install DESTDIR="${prefix}"
|
||||
cmake --build .
|
||||
DESTDIR="${prefix}" cmake --install .
|
||||
|
||||
# Exit
|
||||
cd ../../
|
||||
|
@ -25,7 +25,7 @@ sudo apt-get install --no-install-recommends -y \
|
||||
dpkg-dev \
|
||||
git \
|
||||
cmake \
|
||||
make \
|
||||
ninja-build \
|
||||
libglfw3 libglfw3-dev \
|
||||
libfreeimage3 libfreeimage-dev \
|
||||
crossbuild-essential-armhf \
|
||||
|
@ -28,13 +28,13 @@ setup() {
|
||||
# Build ARM Components
|
||||
mkdir arm
|
||||
cd arm
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE="${ARM_TOOLCHAIN_FILE}" -DMCPI_BUILD_MODE=arm "${extra_arg}" "$@" ../../..
|
||||
cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="${ARM_TOOLCHAIN_FILE}" -DMCPI_BUILD_MODE=arm "${extra_arg}" "$@" ../../..
|
||||
cd ../
|
||||
|
||||
# Build Native Components
|
||||
mkdir native
|
||||
cd native
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}" -DMCPI_BUILD_MODE=native "${extra_arg}" "$@" ../../..
|
||||
cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}" -DMCPI_BUILD_MODE=native "${extra_arg}" "$@" ../../..
|
||||
cd ../
|
||||
|
||||
# Exit
|
||||
@ -55,7 +55,7 @@ armhf_setup() {
|
||||
fi
|
||||
|
||||
# Build All Components
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE="${ARM_TOOLCHAIN_FILE}" -DMCPI_BUILD_MODE=both -DMCPI_SERVER_MODE="${server_mode}" "$@" ../..
|
||||
cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="${ARM_TOOLCHAIN_FILE}" -DMCPI_BUILD_MODE=both -DMCPI_SERVER_MODE="${server_mode}" "$@" ../..
|
||||
|
||||
# Exit
|
||||
cd ../../
|
||||
|
Loading…
Reference in New Issue
Block a user