From 2801032e57b4a79fce54d5092a5578ae363b8679 Mon Sep 17 00:00:00 2001 From: Tomas Pecka <peckato1@fit.cvut.cz> Date: Wed, 26 Jan 2022 15:13:57 +0100 Subject: [PATCH] extra: build.sh now installs into local prefix It will be in $BUILD_DIR/install --- extra/scripts/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extra/scripts/build.sh b/extra/scripts/build.sh index c6399906ea..dd5b646b78 100755 --- a/extra/scripts/build.sh +++ b/extra/scripts/build.sh @@ -4,6 +4,7 @@ BUILD_THREADS="$(grep -c processor /proc/cpuinfo)" BUILD_DIR= BUILD_MODE= BUILD_SYSTEM= +INSTALL_DIR="install" RUN_TESTS=1 is_installed() { @@ -131,6 +132,7 @@ cat >&2 << EOF Building Algorithms Library Core from $ROOT: - Mode: $BUILD_MODE - Into: $ROOT/$BUILD_DIR $BUILD_DIR_SYMLINK + - Install: $ROOT/$BUILD_DIR/$INSTALL_DIR - Threads: $BUILD_THREADS - Builder: $BUILD_SYSTEM - Testing: $RUN_TESTS @@ -154,7 +156,7 @@ else fi -CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$BUILD_MODE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$BUILD_MODE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_INSTALL_PREFIX=${ROOT}/${BUILD_DIR}/${INSTALL_DIR}" if [[ $BUILD_SYSTEM == "ninja" ]]; then CMAKE_FLAGS="$CMAKE_FLAGS -GNinja" fi @@ -163,11 +165,13 @@ cmake $CMAKE_FLAGS ${ROOT} # build and test if [[ $BUILD_SYSTEM == "ninja" ]]; then ninja -j${BUILD_THREADS} || exit 1 + ninja install -j${BUILD_THREADS} || exit 1 if [[ $RUN_TESTS -ne 0 ]]; then ctest . --output-on-failure -j ${BUILD_THREADS} || exit 1 fi else make -j${BUILD_THREADS} || exit 1 + make install -j${BUILD_THREADS} || exit 1 if [[ $RUN_TESTS -ne 0 ]]; then make test ARGS="-j${BUILD_THREADS} --output-on-failure" || exit 1 fi -- GitLab