Skip to content

Commit 6237adb

Browse files
authored
Merge pull request #167 from sloriot/fix_LAS
rapidlasso merged my patch -> branch gets deleted
2 parents 193401c + 019739a commit 6237adb

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

ArchLinux/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ RUN pacman -U --noconfirm *.pkg.tar.zst && \
6868

6969
RUN pacman -Sy --noconfirm unzip wget && pacman -Scc
7070

71-
RUN wget https://github.com/sloriot/LAStools/archive/refs/heads/fix_make_install.zip \
72-
&& unzip fix_make_install.zip \
73-
&& cd LAStools-fix_make_install \
71+
RUN wget https://github.com/LAStools/LAStools/archive/refs/heads/master.zip \
72+
&& unzip master.zip \
73+
&& cd LAStools-master \
7474
&& mkdir build \
7575
&& cd build \
7676
&& cmake -DCMAKE_BUILD_TYPE=Release .. \
7777
&& make -j "$(nproc)" \
7878
&& make install \
7979
&& cd .. \
80-
&& rm -rf LAStools-fix_make_install fix_make_install.zip
80+
&& rm -rf LAStools-master master.zip
8181

8282

8383
# LEDA includes are in a nonstandard location (/usr/include/LEDA/LEDA/...

Fedora/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ RUN dnf -y install \
3737
lsb-release \
3838
json-devel
3939

40-
RUN wget https://github.com/sloriot/LAStools/archive/refs/heads/fix_make_install.zip \
41-
&& unzip fix_make_install.zip \
42-
&& cd LAStools-fix_make_install \
40+
RUN wget https://github.com/LAStools/LAStools/archive/refs/heads/master.zip \
41+
&& unzip master.zip \
42+
&& cd LAStools-master \
4343
&& mkdir build \
4444
&& cd build \
4545
&& cmake -DCMAKE_BUILD_TYPE=Release .. \
4646
&& make -j "$(nproc)" \
4747
&& make install \
4848
&& cd .. \
49-
&& rm -rf LAStools-fix_make_install fix_make_install.zip
49+
&& rm -rf LAStools-master master.zip
5050

5151

5252

Ubuntu-clang-latest/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ RUN apt-get update \
2121
&& make -j"$(nproc)" install \
2222
&& cd /tmp && rm -rf build llvm
2323

24-
RUN wget https://github.com/sloriot/LAStools/archive/refs/heads/fix_make_install.zip \
25-
&& unzip fix_make_install.zip \
26-
&& cd LAStools-fix_make_install \
24+
RUN wget https://github.com/LAStools/LAStools/archive/refs/heads/master.zip \
25+
&& unzip master.zip \
26+
&& cd LAStools-master \
2727
&& mkdir build \
2828
&& cd build \
2929
&& cmake -DCMAKE_BUILD_TYPE=Release .. \
3030
&& make -j "$(nproc)" \
3131
&& make install \
3232
&& cd .. \
33-
&& rm -rf LAStools-fix_make_install fix_make_install.zip
33+
&& rm -rf LAStools-master master.zip
3434

3535
ENV CGAL_TEST_PLATFORM="Ubuntu-clang-latest"
3636
ENV CXX=/usr/local/bin/clang++

0 commit comments

Comments
 (0)