Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update LAStools #162

Merged
merged 1 commit into from
Sep 10, 2024
Merged

update LAStools #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions ArchLinux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 8 additions & 6 deletions Fedora/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 9 additions & 7 deletions Ubuntu-clang-latest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++
Expand Down