Commit 18508153 authored by Mark Meredith's avatar Mark Meredith
Browse files

Simplify CI deps

parent 35a181b9

.gitlab-ci.yml

+4 −26
Original line number Diff line number Diff line
@@ -24,33 +24,11 @@ build-img: 
  image: $CI_REGISTRY_IMAGE:latest

  needs: ['build-img']

  script:

    - git clone --depth 1 --branch v2.13.7 https://github.com/catchorg/Catch2

    - cmake -SCatch2 -Bbuild-catch2 -GNinja

    - cmake --build build-catch2 --target install

    - conan install -if build -g cmake_find_package catch2/2.13.7@

    - conan install -if build -g cmake_find_package cgal/5.2.1@

    - conan install -if build -g cmake_find_package taocpp-pegtl/3.2.1@



    - wget https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz

    - tar xf gmp-6.2.1.tar.lz

    - pushd gmp-6.2.1

    - ./configure

    - make install

    - popd



    - wget https://www.mpfr.org/mpfr-current/mpfr-4.1.0.tar.xz

    - tar xf mpfr-4.1.0.tar.xz

    - pushd mpfr-4.1.0

    - ./configure

    - make install

    - popd



    - git clone --depth 1 --branch v5.3 https://github.com/CGAL/cgal

    - cmake -Scgal -Bbuild-cgal -GNinja

    - cmake --build build-cgal --target install



    - git clone --branch 3.2.2 https://github.com/taocpp/PEGTL

    - cmake -SPEGTL -Bbuild-pegtl -GNinja

    - cmake --build build-pegtl --target install



    - cmake -S. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE

    - cmake -S. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_MODULE_PATH=$PWD/build

    - cmake --build build --target unit_tests_csg

    - cd build

    - ctest

Dockerfile

+1 −5
Original line number Diff line number Diff line
@@ -8,21 +8,17 @@ ENV DEBIAN_FRONTEND noninteractive 


RUN apt-get -qq update \

  && apt-get -qq -y install --no-install-recommends \

  autoconf=2.* \

  build-essential=12.* \

  git=1:2.* \

  libboost-all-dev=1.* \

  lunzip=1.* \

  m4=1.* \

  openscad=2019.* \

  pkg-config=0.29.* \

  python3-pip=20.* \

  python3-venv=3.8.* \

  wget=1.* \

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



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

  cmake==3.* \

  conan==1.* \

  ninja==1.*



CMD [ "/bin/bash" ]

src/csg/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ add_library(csg-eb 
  )



target_link_libraries(csg-eb PRIVATE

                      CGAL::CGAL

                      stdc++fs

                      taocpp::pegtl

                      )

src/csg/tests/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ target_include_directories(unit_tests_csg 
find_package(Catch2 REQUIRED)

include(Catch)

target_link_libraries(unit_tests_csg

  csg-eb

  CGAL::CGAL

  Catch2::Catch2

  csg-eb

  )



catch_discover_tests(unit_tests_csg)