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

815 Commits

Author SHA1 Message Date
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 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch' 
whitespace+tab removal, merged with option -Xignore-all-space
 2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Mael 8ee3ec8f7b
Merge branch 'master' into PMP-Add_split_to_clip-GF 2020-03-17 19:47:28 +01:00
Sebastien Loriot 1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno 
PMP: Default Property_maps for Index_maps
 2020-03-17 18:27:55 +01:00
Mael Rouxel-Labbé fba9a19fe4 Add missing #include's 2020-03-09 10:03:31 +01:00
Maxime Gimeno 138ab5e036 restore new dependency 2020-02-13 13:43:58 +01:00
Maxime Gimeno e9864cf874 Fixes after review 2020-02-11 14:13:56 +01:00
Maxime Gimeno 0378d7825f Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-02-10 15:53:05 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Mael Rouxel-Labbé 84215c95c4 Merge branch 'Box_intersection_d-accelerate-GF-old' into Box_intersection_d-accelerate-GF 2020-02-07 11:03:07 +01:00
Maxime Gimeno 1f0d062c10 Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-01-27 12:51:26 +01:00
Laurent Rineau e872a79da3 Merge pull request #4443 from MaelRL/SMP-Fix_solver_traits_pragma_message-GF 
SMP: Fix bad usage of pragma message
 2020-01-15 17:31:47 +01:00
Laurent Rineau 4a9eea9778 Merge pull request #4443 from MaelRL/SMP-Fix_solver_traits_pragma_message-GF 
SMP: Fix bad usage of pragma message
 2020-01-15 17:19:19 +01:00
Mael Rouxel-Labbé 5806b8831e Fix bad usage of pragma message 
The previous error message would show up even if Eigen is not available
and the user has passed a solver traits.

Reported in https://github.com/CGAL/cgal/issues/4442#issuecomment-570511774
 2020-01-03 11:07:43 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Mael Rouxel-Labbé 41bb11cdee Make unique indentation style a little less unique (no real changes) 2019-11-19 17:08:25 +01:00
Mael Rouxel-Labbé b6dd62be52 Use ID_FROM_BOX_ADDRESS in Box_with_info_d where safe 
That is, where we are passing box ranges by pointer.

See also 52ce0b6ac4
 2019-11-19 17:06:47 +01:00
Laurent Rineau 15d9e1f0ff Restore the alphabetical order of `dependencies` files 2019-10-31 14:41:37 +01:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Laurent Rineau 38539d9a70 Merge pull request #4276 from MaelRL/SMP-ARAP_improvements-GF 
SMP: Various improvements to the ARAP parameterizer

# Conflicts:
#	Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
 2019-10-15 16:33:47 +02:00
Mael Rouxel-Labbé 79362c0714 Fix typo 2019-10-07 13:10:34 +02:00
Mael Rouxel-Labbé ffb18e9e6d Improve energy-related end condition and verbose 
- Ignore negative energies (bad for my chakras)
- Only compute energies if we need them
- Fix verbose and counter
 2019-10-07 13:08:01 +02:00
Mael Rouxel-Labbé 0840a6e1a3 Enforce constraints by not updating their position 2019-10-07 13:07:30 +02:00
Mael Rouxel-Labbé 5983a80f6f Fix missing namespace 2019-10-07 13:07:13 +02:00
Mael Rouxel-Labbé 2b8c61b5ab Update which solvers are used in ARAP parameterization 2019-10-07 13:04:45 +02:00
Mael Rouxel-Labbé e4c0bcffa0 Update usage of intersection tags 2019-09-19 18:32:34 +02:00
Maxime Gimeno 76e6fbcb95 Update dependencies 2019-07-05 14:54:19 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Mael Rouxel-Labbé 0b506f5cce Fix package dependencies 2019-05-10 12:41:25 +02:00
Sébastien Loriot a5ff70122c Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-12 15:43:10 +02:00
Sébastien Loriot 82103c8ebd Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-04-12 15:42:03 +02:00
Mael Rouxel-Labbé 6b43eaa311 Mute SMP's ARAP and Orbifold by default 2019-04-05 10:27:20 +02:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop 
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
 2019-03-29 13:22:15 +01:00
Laurent Rineau 0d5009e582 Merge branch 'releases/CGAL-4.13-branch' 2019-03-26 16:43:41 +01:00
Laurent Rineau 0aa49e3549 Merge pull request #3783 from afabri/BGL_add_seams-GF 
BGL:  Seam_mesh::add_seams() requires .selection.txt
 2019-03-26 16:42:59 +01:00
Andreas Fabri 99a16d2c8f Fix example 2019-03-20 16:11:48 +01:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers 
Update of headers
 2019-02-22 16:39:09 +01:00
Sébastien Loriot a5576cd3fb replace markdown subsections by \cgalHeading 2019-02-14 10:53:48 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man 
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
 2019-02-14 10:32:39 +01:00
Andreas Fabri a483f3442b CGAL: clean up CMakeLists.txt files in examples and tests 2019-02-13 17:29:29 +01:00
Laurent Rineau 6ffd76a87e Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF 
Intersections_3:  Add missing do_intersect() overloads
 2019-01-18 16:37:54 +01:00
Andreas Fabri a6c1632f82 No need to disable warnings 2018-12-13 09:51:47 +01:00