Merge pull request #167 from sloriot/fix_LAS

rapidlasso merged my patch -> branch gets deleted
CGAL · Dec 16, 2024 · 6237adb · 6237adb
2 parents 193401c + 019739a
commit 6237adb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile
@@ -68,16 +68,16 @@ RUN pacman -U --noconfirm *.pkg.tar.zst && \
 
 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 \
+RUN wget https://github.com/LAStools/LAStools/archive/refs/heads/master.zip \
+ && unzip master.zip \
+ && cd LAStools-master \
  && 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
+ && rm -rf LAStools-master master.zip
 
 
 # LEDA includes are in a nonstandard location (/usr/include/LEDA/LEDA/...

diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile
@@ -37,16 +37,16 @@ RUN dnf -y install \
     lsb-release \
     json-devel
 
-RUN wget https://github.com/sloriot/LAStools/archive/refs/heads/fix_make_install.zip \
- && unzip fix_make_install.zip \
- && cd LAStools-fix_make_install \
+RUN wget https://github.com/LAStools/LAStools/archive/refs/heads/master.zip \
+ && unzip master.zip \
+ && cd LAStools-master \
  && 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
+ && rm -rf LAStools-master master.zip
 
 
 

diff --git a/Ubuntu-clang-latest/Dockerfile b/Ubuntu-clang-latest/Dockerfile
@@ -21,16 +21,16 @@ RUN apt-get update \
  && make -j"$(nproc)" install \
  && 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 \
+RUN wget https://github.com/LAStools/LAStools/archive/refs/heads/master.zip \
+ && unzip master.zip \
+ && cd LAStools-master \
  && 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
+ && rm -rf LAStools-master master.zip
 
 ENV CGAL_TEST_PLATFORM="Ubuntu-clang-latest"
 ENV CXX=/usr/local/bin/clang++