diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a756713d3ee088060581db98b68f07e9d38ef87c..4442a8979833e39975393dbe8bf4d33cf0a9b28d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/Dockerfile b/Dockerfile index 74517398c5d73c46be2de26c2b6871622da88233..54085aebbff56126c275e978c9b81b72d40530b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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" ] diff --git a/src/csg/CMakeLists.txt b/src/csg/CMakeLists.txt index 93513bf9cf5a486ca186d15a06e1a933e67138b9..bcf3a9b78a3b1fe6c5cc854bb848bb2617d0818c 100644 --- a/src/csg/CMakeLists.txt +++ b/src/csg/CMakeLists.txt @@ -13,6 +13,7 @@ add_library(csg-eb ) target_link_libraries(csg-eb PRIVATE + CGAL::CGAL stdc++fs taocpp::pegtl ) diff --git a/src/csg/tests/CMakeLists.txt b/src/csg/tests/CMakeLists.txt index f4b7dde4b0187e2bd58dcee99731f5b053d735b8..7041326235fcae5353f30bb3b253883c1dcd57d6 100644 --- a/src/csg/tests/CMakeLists.txt +++ b/src/csg/tests/CMakeLists.txt @@ -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)