mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-11 17:51:04 +00:00
Use CMake's -B, --build, and --install options
This commit is contained in:
parent
f5e54cd398
commit
24a0f55c9c
6 changed files with 22 additions and 33 deletions
|
@ -116,14 +116,12 @@ git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
|
|||
# Build the thing
|
||||
cd $builddir
|
||||
[ -d build ] && rm -rf build
|
||||
mkdir build
|
||||
cd build
|
||||
|
||||
irr_dlls=$(echo $libdir/irrlicht/lib/*.dll | tr ' ' ';')
|
||||
vorbis_dlls=$(echo $libdir/libvorbis/bin/libvorbis{,file}-*.dll | tr ' ' ';')
|
||||
gettext_dlls=$(echo $libdir/gettext/bin/lib{intl,iconv}-*.dll | tr ' ' ';')
|
||||
|
||||
cmake -S $sourcedir -B . \
|
||||
cmake -S $sourcedir -B build \
|
||||
-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
|
||||
-DCMAKE_INSTALL_PREFIX=/tmp \
|
||||
-DVERSION_EXTRA=$git_hash \
|
||||
|
@ -184,9 +182,9 @@ cmake -S $sourcedir -B . \
|
|||
-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
|
||||
-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll
|
||||
|
||||
make -j$(nproc)
|
||||
cmake --build build -j$(nproc)
|
||||
|
||||
[ -z "$NO_PACKAGE" ] && make package
|
||||
[ -z "$NO_PACKAGE" ] && cmake --build build --target package
|
||||
|
||||
exit 0
|
||||
# EOF
|
||||
|
|
|
@ -113,14 +113,12 @@ git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
|
|||
# Build the thing
|
||||
cd $builddir
|
||||
[ -d build ] && rm -rf build
|
||||
mkdir build
|
||||
cd build
|
||||
|
||||
irr_dlls=$(echo $libdir/irrlicht/lib/*.dll | tr ' ' ';')
|
||||
vorbis_dlls=$(echo $libdir/libvorbis/bin/libvorbis{,file}-*.dll | tr ' ' ';')
|
||||
gettext_dlls=$(echo $libdir/gettext/bin/lib{intl,iconv}-*.dll | tr ' ' ';')
|
||||
|
||||
cmake -S $sourcedir -B . \
|
||||
cmake -S $sourcedir -B build \
|
||||
-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
|
||||
-DCMAKE_INSTALL_PREFIX=/tmp \
|
||||
-DVERSION_EXTRA=$git_hash \
|
||||
|
@ -181,9 +179,9 @@ cmake -S $sourcedir -B . \
|
|||
-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
|
||||
-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll
|
||||
|
||||
make -j$(nproc)
|
||||
cmake --build build -j$(nproc)
|
||||
|
||||
[ -z "$NO_PACKAGE" ] && make package
|
||||
[ -z "$NO_PACKAGE" ] && cmake --build build --target package
|
||||
|
||||
exit 0
|
||||
# EOF
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
#! /bin/bash -e
|
||||
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Debug \
|
||||
cmake -B build -DCMAKE_BUILD_TYPE=Debug \
|
||||
-DRUN_IN_PLACE=TRUE -DENABLE_GETTEXT=TRUE \
|
||||
-DBUILD_SERVER=TRUE ${CMAKE_FLAGS} ..
|
||||
make -j$(($(nproc) + 1))
|
||||
-DBUILD_SERVER=TRUE ${CMAKE_FLAGS}
|
||||
cmake --build build --parallel $(($(nproc) + 1))
|
||||
|
|
|
@ -1,15 +1,11 @@
|
|||
#! /bin/bash -eu
|
||||
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Debug \
|
||||
cmake -B build -DCMAKE_BUILD_TYPE=Debug \
|
||||
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
|
||||
-DRUN_IN_PLACE=TRUE \
|
||||
-DENABLE_{GETTEXT,SOUND}=FALSE \
|
||||
-DBUILD_SERVER=TRUE ..
|
||||
make GenerateVersion
|
||||
|
||||
cd ..
|
||||
-DBUILD_SERVER=TRUE
|
||||
cmake --build build --target GenerateVersion
|
||||
|
||||
./util/ci/run-clang-tidy.py \
|
||||
-clang-tidy-binary=clang-tidy-9 -p build \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue