diff --git a/.gitlab/ci/docker/ubuntu22/Dockerfile b/.gitlab/ci/docker/ubuntu22/Dockerfile index eb4293fd5c3df4f55e7c1c4a8f282294ced759b5..0d41eee0d292550c2fe47fe99fcf089446187dc3 100644 --- a/.gitlab/ci/docker/ubuntu22/Dockerfile +++ b/.gitlab/ci/docker/ubuntu22/Dockerfile @@ -12,3 +12,6 @@ RUN sh /root/install_ceres.sh COPY install_nanoflann.sh /root/install_nanoflann.sh RUN sh /root/install_nanoflann.sh + +COPY install_tins.sh /root/install_tins.sh +RUN sh /root/install_tins.sh diff --git a/.gitlab/ci/docker/ubuntu22/install_tins.sh b/.gitlab/ci/docker/ubuntu22/install_tins.sh new file mode 100755 index 0000000000000000000000000000000000000000..f69d0b744a6f97fd359493cdfb8a605b8d649087 --- /dev/null +++ b/.gitlab/ci/docker/ubuntu22/install_tins.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +readonly version="4.5" +readonly tarball="v$version.tar.gz" +readonly sha256sum="6ff5fe1ada10daef8538743dccb9c9b3e19d05d028ffdc24838e62ff3fc55841" + +readonly tins_root="$HOME/tins" +readonly tins_src="$tins_root/src" +readonly tins_build_root="$tins_root/build" + +mkdir -p "$tins_root" +cd "$tins_root" + +echo "$sha256sum $tarball" > tins.sha256sum +curl -OL "https://github.com/mfontanini/libtins/archive/refs/tags/v$version.tar.gz" +sha256sum --check tins.sha256sum +mkdir -p "$tins_src" +tar -xf "$tarball" -C "$tins_src" --strip-components 1 --no-same-owner + +tins_build () { + local prefix="$1" + shift + + cmake -GNinja \ + -S "$tins_src" \ + -B "$tins_build_root" \ + -DCMAKE_BUILD_TYPE=Release \ + -DLIBTINS_BUILD_TESTS=OFF \ + -DLIBTINS_BUILD_EXAMPLES=OFF \ + "-DCMAKE_INSTALL_PREFIX=$prefix" \ + "$@" + cmake --build "$tins_build_root" --target install +} + +tins_build /usr + +rm -rf "$tins_root" diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 44db4e36be1d9da09cce0fa4f8e0912e8556609a..a139bacfa724628fda4e1f2d7239bf8e36326e59 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -8,7 +8,7 @@ .ubuntu22: extends: .linux - image: "gitlab.kitware.com:4567/lidarview/lidarview:ci-ubuntu22-20240626" + image: "gitlab.kitware.com:4567/lidarview/lidarview:ci-ubuntu22-20240724" .ubuntu22_debug: extends: .ubuntu22 diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index ed76a68e97632719c32c3579146d9f058364bfbf..efcad11fb51a16ecccf0bd686288dce97541b283 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -4,7 +4,7 @@ .windows: variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR\\lidarview-ci\\$CI_PROJECT_ID" - LVSB_PATH: "$CI_BUILDS_DIR\\lidarview-ci\\DEPS-240703" + LVSB_PATH: "$CI_BUILDS_DIR\\lidarview-ci\\DEPS-240724" GIT_SUBMODULE_DEPTH: 1 # Force "desktop" OpenGL support. Qt seems to want to use EGL when run diff --git a/LVCore b/LVCore index ff4e32ba8490d5f3b3dd9a2aa403999db6a3767f..27e6214e9b9ef2b0f6d676d95622c8ab061c72f0 160000 --- a/LVCore +++ b/LVCore @@ -1 +1 @@ -Subproject commit ff4e32ba8490d5f3b3dd9a2aa403999db6a3767f +Subproject commit 27e6214e9b9ef2b0f6d676d95622c8ab061c72f0