diff options
author | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:17:15 +0100 |
---|---|---|
committer | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:17:15 +0100 |
commit | 289baa1aadd248940439698173caaa345ac0ba3d (patch) | |
tree | 719f4cee23b2eb5b98b51fb7520336df920024ae /Dockerfile_for_circleci_image | |
parent | 5a450e1d5e0faac25085fb96d756d5963d0a15c4 (diff) | |
parent | b6a3def70b15baf2dda0844762dcd291e240d2c1 (diff) |
Merge branch 'dfsg/latest' into debian/sid
Diffstat (limited to 'Dockerfile_for_circleci_image')
-rw-r--r-- | Dockerfile_for_circleci_image | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Dockerfile_for_circleci_image b/Dockerfile_for_circleci_image index 464097e7..ec1b8ff8 100644 --- a/Dockerfile_for_circleci_image +++ b/Dockerfile_for_circleci_image @@ -23,6 +23,9 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 +# Update again +RUN apt-get update + # Required for Gudhi compilation RUN apt-get install -y make \ git \ @@ -38,7 +41,6 @@ RUN apt-get install -y make \ libgmp3-dev \ libmpfr-dev \ libtbb-dev \ - libcgal-dev \ locales \ python3 \ python3-pip \ @@ -48,6 +50,15 @@ RUN apt-get install -y make \ pkg-config \ curl +RUN curl -LO "https://github.com/CGAL/cgal/releases/download/v5.1/CGAL-5.1.tar.xz" \ + && tar xf CGAL-5.1.tar.xz \ + && mkdir build \ + && cd build \ + && cmake -DCMAKE_BUILD_TYPE=Release ../CGAL-5.1/ \ + && make install \ + && cd .. \ + && rm -rf build CGAL-5.1 + ADD .github/build-requirements.txt / ADD .github/test-requirements.txt / |