From f60e7903faee5f045db0073c095d34f066190538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Tue, 10 Sep 2024 13:58:25 +0200
Subject: [PATCH] update LAStools

---
 ArchLinux/Dockerfile           | 25 +++++++++++++------------
 Fedora/Dockerfile              | 14 ++++++++------
 Ubuntu-clang-latest/Dockerfile | 16 +++++++++-------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile
index 1c8d2f9..1c234a7 100644
--- a/ArchLinux/Dockerfile
+++ b/ArchLinux/Dockerfile
@@ -66,18 +66,19 @@ WORKDIR /tmp/makepkg
 RUN pacman -U --noconfirm *.pkg.tar.zst && \
     rm *.pkg.tar.zst
 
-RUN pacman -Sy --noconfirm unzip \
-    && cd /tmp \
-    && curl -sSL "https://github.com/CGAL/LAStools/archive/LAStools-2020-11-09.zip" -o master.zip \
-    && unzip master.zip \
-    && cd ./LAStools-LAStools-2020-11-09 \
-    && cmake -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++ -DCMAKE_CXX_FLAGS=-std=c++11 . \
-    && make -j "$(nproc)" \
-    && make install \
-    && cd .. \
-    && rm -rf LAStools-LAStools-2020-11-09 \
-    && rm -rf master.zip \
-    && pacman -Scc
+RUN pacman -Sy --noconfirm unzip wget  && pacman -Scc
+
+RUN wget https://github.com/sloriot/LAStools/archive/refs/heads/fix_make_install.zip \
+ && unzip fix_make_install.zip \
+ && cd LAStools-fix_make_install \
+ && mkdir build \
+ && cd build \
+ && cmake -DCMAKE_BUILD_TYPE=Release .. \
+ && make -j "$(nproc)" \
+ && make install \
+ && cd .. \
+ && rm -rf LAStools-fix_make_install fix_make_install.zip
+
 
 # LEDA includes are in a nonstandard location (/usr/include/LEDA/LEDA/...
 # instead of just /usr/include/LEDA/...) in Stephan Friedrich's AUR package,
diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile
index 1e14652..90709a3 100644
--- a/Fedora/Dockerfile
+++ b/Fedora/Dockerfile
@@ -37,15 +37,17 @@ RUN dnf -y install \
     lsb-release \
     json-devel
 
-RUN wget "https://github.com/CGAL/LAStools/archive/LAStools-2020-11-09.zip" -O laslib.zip \
- && unzip laslib.zip \
- && cd ./LAStools-LAStools-2020-11-09 \
- && cmake -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++ -DCMAKE_CXX_FLAGS=-std=c++11 . \
+RUN wget https://github.com/sloriot/LAStools/archive/refs/heads/fix_make_install.zip \
+ && unzip fix_make_install.zip \
+ && cd LAStools-fix_make_install \
+ && mkdir build \
+ && cd build \
+ && cmake -DCMAKE_BUILD_TYPE=Release .. \
  && make -j "$(nproc)" \
  && make install \
  && cd .. \
- && rm -rf LAStools-LAStools-2020-11-09 \
- && rm -rf laslib.zip
+ && rm -rf LAStools-fix_make_install fix_make_install.zip
+
 
 
 ENV CGAL_TEST_PLATFORM="Fedora"
diff --git a/Ubuntu-clang-latest/Dockerfile b/Ubuntu-clang-latest/Dockerfile
index d1fc11e..ddc536e 100644
--- a/Ubuntu-clang-latest/Dockerfile
+++ b/Ubuntu-clang-latest/Dockerfile
@@ -19,16 +19,18 @@ RUN apt-get update \
  && cmake -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++ ../llvm -DCMAKE_BUILD_TYPE=Release \
  && make -j"$(nproc)" \
  && make -j"$(nproc)" install \
- && cd /tmp && rm -rf build llvm \
- && wget "https://github.com/CGAL/LAStools/archive/LAStools-2020-11-09.zip" -O laslib.zip \
- && unzip laslib.zip \
- && cd ./LAStools-LAStools-2020-11-09 \
- && cmake -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++ -DCMAKE_CXX_FLAGS=-std=c++11 . \
+ && cd /tmp && rm -rf build llvm
+
+RUN wget https://github.com/sloriot/LAStools/archive/refs/heads/fix_make_install.zip \
+ && unzip fix_make_install.zip \
+ && cd LAStools-fix_make_install \
+ && mkdir build \
+ && cd build \
+ && cmake -DCMAKE_BUILD_TYPE=Release .. \
  && make -j "$(nproc)" \
  && make install \
  && cd .. \
- && rm -rf LAStools-LAStools-2020-11-09 \
- && rm -rf laslib.zip
+ && rm -rf LAStools-fix_make_install fix_make_install.zip
 
 ENV CGAL_TEST_PLATFORM="Ubuntu-clang-latest"
 ENV CXX=/usr/local/bin/clang++