Skip to content

Commit

Permalink
Merge branch 'master' into python3
Browse files Browse the repository at this point in the history
  • Loading branch information
lrineau committed Jan 18, 2024
2 parents 48ef5c0 + d7d50f3 commit fbcfe30
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ testsuite/*
.vscode
/cgal/
/cgal.tar.gz
/testresults/installation.log
/testresults/installation*.log
/testresults/list_test_packages
/testresults/package_installation.log
/testresults/package_installation*.log
/testresults/ctest*.log
7 changes: 7 additions & 0 deletions ArchLinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,12 @@ RUN pacman -Sy --noconfirm unzip \
#
ENV CGAL_TEST_PLATFORM="ArchLinux" \
LEDA_INC_DIR=/usr/include/LEDA

# Try to fix a strange bug with clang
# where make complains about files in /include:
#
# Prerequisite '/include/c++/13.2.1/algorithm' of target 'test/AABB_tree_Demo/CMakeFiles/CGAL_Qt6_moc_and_resources.dir/CGAL_Qt6_moc_and_resources_autogen/mocs_compilation.cpp.o' does not exist.
RUN ln -s /usr/include /include

ENV INIT_FILE=/tmp/init.cmake
COPY init.cmake /tmp/init.cmake
3 changes: 2 additions & 1 deletion Ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
libmpfr-dev zlib1g-dev \
libeigen3-dev libipe-dev \
libmpfi-dev \
libinsighttoolkit4-dev libtbb-dev git
libinsighttoolkit4-dev libtbb-dev git \
libyaml-cpp-dev

# cgal.gf.com kernel does not seem compatible with qt6
# libgl-dev \
Expand Down

0 comments on commit fbcfe30

Please sign in to comment.