Commit Graph

208 Commits

Author SHA1 Message Date
Maxime Gimeno e2eca0150b Merge remote-tracking branch 'cgal/master' into CGAL-CMake_testsuite-maxGimeno 2020-08-21 14:40:58 +02:00
Maxime Gimeno 59a4c1d1d1 use a better ppa with the right libs. 2020-08-20 10:55:05 +02:00
Maxime Gimeno 9de91a3386 Disable boost_serialization and iostreams 2020-08-18 12:16:25 +02:00
Maxime Gimeno dac614bd02 Update to bionic and install and use clang-10 2020-08-04 10:12:58 +02:00
Maxime Gimeno 0c35447ebc add ppa non-interractively 2020-08-03 14:15:00 +02:00
Maxime Gimeno 7efa1d8771 use a ppa to get boost-1.73 2020-07-29 15:22:47 +02:00
Maxime Gimeno 88f0734749 Fix cgal_dirs 2020-07-22 14:12:17 +02:00
Maxime Gimeno cdaa213272 Add a label 2020-07-22 13:34:11 +02:00
Maxime Gimeno 241d477efd Add tests in both travis and the Installation/tests. 2020-07-22 12:44:18 +02:00
Maxime Gimeno 24214def33 Add some tests in Installation for travis. 2020-07-09 15:47:43 +02:00
Laurent Rineau a828cb0d06 Merge pull request #4620 from janetournois/Tetrahedral_remeshing-new-jtournois
Tetrahedral remeshing - new package
2020-06-03 16:23:17 +02:00
Maxime Gimeno 08af169d6c fix travis 2020-05-19 13:34:59 +02:00
Maxime Gimeno b1d5cb27c3 add missing cmake flags 2020-04-27 15:43:36 +02:00
Maxime Gimeno 4e3465c36c Add a fake windows.h for travis to detect the most common mistakes. 2020-04-27 11:20:11 +02:00
Sébastien Loriot c5af2b25f3 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-22 13:27:29 +02:00
Sébastien Loriot 157bdbda08 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-04-22 13:26:52 +02:00
Jane Tournois cf58a08a55 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-20 06:24:36 +02:00
Maxime Gimeno f1a126e1c8 Switch on for three in travis 2020-04-14 09:58:14 +02:00
Sébastien Loriot d42b2299d8 update travis 2020-04-10 11:26:16 +02:00
Sébastien Loriot 0c8c36fe90 patch at the wrong line 2020-04-02 14:48:57 +02:00
Sébastien Loriot 9f2eafd06e extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:17:02 +01:00
Sébastien Loriot 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot 8c011a0467 remove addition of trailing whitespace for dependancies 2020-03-26 13:24:25 +01:00
Mael Rouxel-Labbé 2556196dad Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-23 08:59:49 +01:00
Sébastien Loriot 32813dc976 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-16 16:32:47 +01:00
Mael Rouxel-Labbé 3e365756ca Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2020-03-09 16:54:25 +01:00
Maxime Gimeno e507e80e22 Don't compute depenencies in case a package is missing. 2020-03-05 16:34:03 +01:00
Mael Rouxel-Labbé b33ddb6b43 Run generate_travis.sh 2019-12-10 14:47:11 +01:00
Mael Rouxel-Labbé c844a98dd8 Add to travis' package list 2019-12-09 15:44:56 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Sébastien Loriot 724e70b97f Merge pull request #3984 from LiangliangNan/master
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
2019-07-18 17:05:25 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Laurent Rineau 58b4c3938e Merge pull request #4045 from maxGimeno/Travis-Compute_dependencies_if_missing-GF
Travis: compute dependencies when file is missing
2019-07-10 14:22:47 +02:00
Maxime Gimeno 70b6472207 compute dependencies if missing 2019-07-02 11:36:12 +02:00
Maxime Gimeno 7155df2743 Merge remote-tracking branch 'cgal/master' into liangliang_master 2019-07-01 14:59:24 +02:00
Maxime Gimeno 450a9e67cd compute dependencies if missing 2019-07-01 10:25:16 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Liangliang Nan 5061a00621 Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-07 16:21:04 +02:00
Maxime Gimeno 33c9a0833f print diff in check 2019-06-06 16:56:14 +02:00
Maxime Gimeno 39d81a8d68 Use LC_COLLATE to unify the order of the packages list. 2019-06-06 16:07:47 +02:00
Liangliang Nan 02ef4cae1c updated .travis.yml
by calling generate_travis.sh
2019-06-06 14:14:58 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Laurent Rineau 1b92bcd74e Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
# Conflicts:
#	.travis.yml
#	.travis/template.txt
2019-05-20 12:27:11 +02:00
Laurent Rineau 7fe156dae7 Use $TRAVIS_PULL_REQUEST_BRANCH instead
`TRAVIS_PULL_REQUEST` is actually never empty:
> `TRAVIS_PULL_REQUEST`: The pull request number if the current job is a pull request, “false” if it’s not a pull request.

(from the [documentation](https://docs.travis-ci.com/user/environment-variables/#default-environment-variables))

Use `TRAVIS_PULL_REQUEST_BRANCH` instead:
> `TRAVIS_PULL_REQUEST_BRANCH`:
>    - if the current job is a pull request, the name of the branch from which the PR originated.
>    - if the current job is a push build, this variable is empty ("").
2019-05-15 11:46:52 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00