Commit 346df8b4 authored by Mark Meredith's avatar Mark Meredith
Browse files

Update Dockerfile

parent 7699353c

Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ RUN apt-get -qq update \ 
  ninja-build=1.10.0-1build1 \

  openscad=2019.05-3ubuntu5 \

  pkg-config=0.29.1-0ubuntu4 \

  python3-pip=20.0.2-5ubuntu1.1 \

  python3-pip=20.0.2-5ubuntu1.5 \

  python3-venv=3.8.2-0ubuntu2 \

  && apt-get clean && rm -rf /var/lib/apt/lists/* \



  && pip3 install --no-cache-dir \

  cmake==3.18.4.post1 \

  conan==1.35.2

  cmake==3.21.0 \

  conan==1.38



CMD [ "/bin/bash" ]

conanfile.py

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ class CsgEbConan(ConanFile): 
    default_options = {"shared": False}

    generators = "pkg_config"

    requires = ("catch2/2.13.6", "cgal/5.2.1", "taocpp-pegtl/3.2.0")

    build_requires = ("meson/0.57.2",)

    build_requires = ("meson/0.59.0",)

    exports_sources = "meson.build", "include/*", "src/*"



    def build(self):