songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
88,761 Commits 3 Branches 156 Tags 963 MiB
Commit Graph

175 Commits

Author SHA1 Message Date
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
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau 
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
 2019-05-14 16:18:24 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF 
Adapt to Boost 1.70
 2019-05-07 15:48:03 +02:00
Laurent Rineau 5b9766c946 Add VERBOSE=1 to Travis 'make' commands 2019-04-29 15:24:51 +02:00
Maxime Gimeno 6c4ca97c25 Fix travis 2019-04-24 15:57:53 +02:00
Dmitry Anisimov ead5539da8 updated travis 2019-04-19 15:58:28 +02:00
Maxime Gimeno 4d5521e644 fix list of packages 2019-04-09 14:55:53 +02:00
Maxime Gimeno 78db3f646d Solve conflicts 2019-04-09 10:04:44 +02:00
Maxime Gimeno 89d50db998 Don't compare with master but with the branch of the PR 2019-04-04 15:48:44 +02:00
Guillaume Damiand 379c90420b Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2019-03-27 12:40:33 +01:00
Laurent Rineau 53709a4bce Try not to quote % 
And rename the `time` function in `build_package.sh`.
 2019-03-13 17:28:03 +01:00
Laurent Rineau cdf90303ce Parse error again! 2019-03-13 16:57:38 +01:00
Laurent Rineau 9bd51b2fdf Run yamllint 
- Quote `:`
- Remove trailing white-space
- Fix indentation
 2019-03-13 16:49:05 +01:00
Laurent Rineau 95b1f47076 Escape % with a backslash 2019-03-13 16:25:50 +01:00
Laurent Rineau 4858aee676 Quote % 2019-03-13 16:23:12 +01:00
Laurent Rineau c90335d8b0 Another attempt: I do not know why Travis cannot parse that file! 2019-03-13 16:14:53 +01:00
Laurent Rineau 438dc91139 Try with simple quotes 2019-03-13 16:12:32 +01:00
Laurent Rineau 11fe55cdb1 Use /usr/bin/time with a special format 2019-03-13 16:05:40 +01:00
Laurent Rineau 6e02c33fde Add calls to `time` to display timings 2019-03-08 16:01:07 +01:00
Laurent Rineau 5199eb70ee Merge pull request #3283 from imiordanov/Periodic_4_hyperbolic_triangulation_2-IIordanov 
New packages: Hyperbolic_triangulation_2 / Periodic_4_hyperbolic_triangulation_2
 2019-02-22 16:39:12 +01:00
Maxime Gimeno ca4f5e12ed Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov 2019-02-12 15:58:49 +01:00
Maxime Gimeno b97ed0bc29 add libqt5sql5-sqlite to the dependencies for p3t3 demo 2019-02-12 14:54:08 +01:00
Laurent Rineau e4b4a85bb8 Merge remote-tracking branch 'cgal/master' into NewKernel_d-lazy_Epeck_d-glisse 2019-02-12 12:07:53 +01:00
Maxime GIMENO 73a22a8655 Remove QGLViewer from travis (#3676) 2019-02-12 11:06:29 +00:00
Laurent Rineau 82403fb131
Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-02-12 08:24:43 +00:00
Maxime GIMENO d884aaadea Travis: Upgrade travis to xenial (#3666) 
Upgrade travis to xenial
 2019-02-12 08:23:09 +00:00
Laurent Rineau 49b3f3648f Try to upgrade Travis configuration to Xenial 2019-02-07 11:04:03 +01:00
Maxime Gimeno 549568a954 Fix conflicts 2019-01-22 10:08:48 +01:00
Laurent Rineau f5a8686cf3 Merge pull request #3439 from aboudev/VSA-lingjie 
New package: Surface_mesh_approximation
 2019-01-22 09:17:35 +01:00
Maxime Gimeno d52718f312 Fix Conflicts 2019-01-21 10:03:31 +01:00
Mael Rouxel-Labbé 45b4735c23 Trying to please travis 2018-12-19 16:10:54 +01:00
Guillaume Damiand 14e32aba01 Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2018-12-14 10:01:38 +01:00
Iordan Iordanov 089c7028c5 travis fixes 2018-12-11 10:10:02 +01:00
Sébastien Loriot 1ede8a09d9 update travis matrix 2018-11-30 10:45:23 +01:00