Merge branch 'main' into 'main'

Switch project builds to ninja

See merge request gabmus/rex2!8
This commit is contained in:
GabMus 2023-07-13 17:27:01 +00:00
commit 9abda70028
3 changed files with 8 additions and 9 deletions

View file

@ -31,6 +31,6 @@ cmake -DCMAKE_BUILD_TYPE=Release \
-Wno-dev \ -Wno-dev \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_INSTALL_LIBDIR="${PREFIX}/lib" \ -DCMAKE_INSTALL_LIBDIR="${PREFIX}/lib" \
.. .. -G Ninja
make -j$(nproc) cmake --build .
make install cmake --install .

View file

@ -34,6 +34,6 @@ cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_C_FLAGS="-Wl,-rpath ${PREFIX}/lib" \ -DCMAKE_C_FLAGS="-Wl,-rpath ${PREFIX}/lib" \
-DCMAKE_CXX_FLAGS="-Wl,-rpath ${PREFIX}/lib" \ -DCMAKE_CXX_FLAGS="-Wl,-rpath ${PREFIX}/lib" \
.. .. -G Ninja
make -j$(nproc) cmake --build .
make install cmake --install .

View file

@ -25,6 +25,5 @@ cd "$REPO_DIR"
rm -rf build rm -rf build
mkdir -p build mkdir -p build
cd build cd build
cmake -DCMAKE_BUILD_TYPE=Release .. cmake -DCMAKE_BUILD_TYPE=Release .. -G Ninja
make clean cmake --build .
make -j$(nproc)