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

1277 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
Sébastien Loriot cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF 
Third party libs: improve documentation + introduce new CMake functions
 2020-03-17 18:19:40 +01:00
Laurent Rineau e828e60b8d Merge pull request #4521 from maxGimeno/Installation-Fix_CGAL_WITH_Qt5-maxGimeno 
Fix CGAL_Qt5_FOUND issue
 2020-02-14 14:39:11 +01:00
Maxime Gimeno 8645e59f00 Fix Qt5 COMPONENT installation and don't copy Qt/* at installation step. 2020-02-12 14:24:29 +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
Laurent Rineau 3b1f11dd0d Merge pull request #4383 from gdamiand/Basic_viewer_bugfix-gdamiand 
Basic viewer bugfix
 2020-01-17 16:28:25 +01:00
Guillaume Damiand a666cb0857 Resolve conflict 2020-01-16 08:33:24 +01:00
Laurent Rineau 67b1b0e04f Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand 
Surface mesh topology (new package)
 2020-01-15 17:24:06 +01:00
Laurent Rineau 25bcb34608 Merge pull request #4440 from maxGimeno/CGAL_qt-Fix_deprecation_warnings-maxGimeno 
Graphics_view : Fix QTime warnings
 2020-01-15 17:19:22 +01:00
Maxime Gimeno fd1a14d74e remove obsolete hint fon antialiasing 2020-01-13 16:33:52 +01:00
Maxime Gimeno 2bb22ad954 Replace `QTime`s by `QElapsedTimer`s. It seems the header of QTime has been deprecated but it has not been documented... 2020-01-13 16:32:49 +01:00
Maxime Gimeno 8b30d9c752 remove obsolete hint fon antialiasing 2020-01-13 15:52:36 +01:00
Maxime Gimeno 1968f2cf20 Replace `QTime`s by `QElapsedTimer`s. It seems the header of QTime has been deprecated but it has not been documented... 2020-01-02 10:04:31 +01:00
Guillaume Damiand 535fff1199 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-05 18:21:41 +01:00
Laurent Rineau 0ea4cf4054 Merge branch 'releases/CGAL-5.0-branch' 2019-12-05 11:04:14 +01:00
Guillaume Damiand 3d0b69be50 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-03 16:15:09 +01:00
Guillaume Damiand 8be7c183b4 Remove warnings (thanks @sloriot) 2019-11-29 15:51:34 +01:00
Guillaume Damiand 1e93ad3579 Draw 2D objects in XY plane to have correct normal by default. 2019-11-29 08:46:16 +01:00
Guillaume Damiand 8ba7f76cd1 Bug fix in Buffer_for_vao.h 2019-11-29 08:35:47 +01:00
Guillaume Damiand e4300e4ddc Anticipate a conflict with another branch. 2019-11-26 13:54:15 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Guillaume Damiand c94c1a0874 Continue case with perforated faces. 2019-11-20 16:04:04 +01:00
Guillaume Damiand 157116f7c8 Re-add add_xxx method as static, since they are used without instance in Polyhedron demo. 2019-11-19 10:36:08 +01:00
Guillaume Damiand 1c52b7e715 One more bug 2019-11-13 12:24:30 +01:00
Guillaume Damiand cc663c5e36 Bugfix for negate normals. 2019-11-13 12:18:27 +01:00
Guillaume Damiand bb117e9792 Bug fix 2019-11-13 11:51:54 +01:00
Guillaume Damiand d638c80b5a
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet 2019-11-12 22:13:10 +01:00
Sébastien Loriot 585bb8c7d6 fix license issues 2019-11-07 06:22:28 +01:00
Sébastien Loriot 9a0bff4008 remove BOOST_FOREACH added by recent PRs 2019-11-04 10:59:15 +01:00
Sébastien Loriot 1ef976e3a5 Remove license notice from libQGLviewer forked files 2019-10-19 16:09:56 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02: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 d0f23b56f6 update deprecated 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-only/"
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-only/"
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-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
 2019-10-18 22:08:05 +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 47fcaf3d47 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF 
Do not require -DCGAL_HEADER_ONLY
 2019-10-15 16:34:09 +02:00
Guillaume Damiand 0707d80d63 Update basic viewer to avoid conflict with another external function. 2019-10-15 11:16:02 +02:00
Guillaume Damiand 9721942d8a Add possibility to draw text. 2019-10-14 14:26:23 +02:00
Laurent Rineau 24a099afc6 Fix CGAL_Qt5 in non-header-only 2019-10-14 11:24:13 +02:00
Guillaume Damiand 4938528f33
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet 2019-09-16 15:13:25 +02:00
Guillaume Damiand 2325a08b5d Remove warning 2019-09-16 14:18:19 +02:00
Maxime Gimeno 660ebe9e81 Add missing highp and remove unwanted highp 2019-08-05 14:16:02 +02:00
Maxime Gimeno b462519b28 Merge remote-tracking branch 'cgal/master' into BasicViewer-Update_shaders-GF 2019-08-05 11:15:20 +02:00
Jasmeet Singh 63d1838b60 Merge remote-tracking branch 'cgal/master' into gsoc2019-add_basic_viewer-jasmeet 2019-07-23 12:27:41 -07:00
Sebastien Loriot 9d20767816
Merge pull request #4080 from gdamiand/patch-1 
Bug fix in is_empty method in Buffer_for_vao
 2019-07-19 15:25:15 +02:00
Jasmeet Singh 8250ae7ce0 Correct comment. 2019-07-18 12:16:03 -07:00