From 9dc6dc0b98da3f1b993054c33faa66d82dded92c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com>
Date: Wed, 24 Jul 2024 13:19:18 +0200
Subject: [PATCH 1/3] [ci] Add libtins in ubuntu docker image

---
 .gitlab/ci/docker/ubuntu22/Dockerfile      |  3 ++
 .gitlab/ci/docker/ubuntu22/install_tins.sh | 39 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100755 .gitlab/ci/docker/ubuntu22/install_tins.sh

diff --git a/.gitlab/ci/docker/ubuntu22/Dockerfile b/.gitlab/ci/docker/ubuntu22/Dockerfile
index eb4293fd5..0d41eee0d 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 000000000..f69d0b744
--- /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"
-- 
GitLab


From e35af1e59cabb3a8416cf7c785cebb1f43faf068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com>
Date: Wed, 24 Jul 2024 13:20:06 +0200
Subject: [PATCH 2/3] [ci] Use images / deps with libtins for ci

---
 .gitlab/os-linux.yml   | 2 +-
 .gitlab/os-windows.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 44db4e36b..a139bacfa 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 ed76a68e9..efcad11fb 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
-- 
GitLab


From 4d33f9f3740b86aea9df7e89fbbcdee645359493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com>
Date: Wed, 24 Jul 2024 18:02:39 +0200
Subject: [PATCH 3/3] [submodule] Bump LVCore

27e6214e Merge branch 'refact/dependsOnLibsTins' into 'master'
af875fb6 Merge branch 'fix/pauseLiveSourceWhenSwitchToReader' into 'master'
1cd73782 Merge branch 'fix/timestampLineEditPrecision' into 'master'
0eea34f9 Merge branch 'feat/useGreaterPrecisionSaveCSV' into 'master'
---
 LVCore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LVCore b/LVCore
index ff4e32ba8..27e6214e9 160000
--- a/LVCore
+++ b/LVCore
@@ -1 +1 @@
-Subproject commit ff4e32ba8490d5f3b3dd9a2aa403999db6a3767f
+Subproject commit 27e6214e9b9ef2b0f6d676d95622c8ab061c72f0
-- 
GitLab