Commit Graph

269 Commits

Author SHA1 Message Date
Maxime Gimeno fb3746168d remove \sc 2021-02-05 11:10:20 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Sébastien Loriot 3b6c100ca6 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-29 14:12:29 +02:00
Dmitry Anisimov 202430d3d5 docs: cleanup, mixed integer concepts relinking, fixing typos 2020-04-20 15:51:48 +02:00
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Mael Rouxel-Labbé d6c1abadcf Add an extra template parameter (dimension) to CGAL::Eigen_vector
Dynamic Eigen::vectors are slower
2020-03-27 18:17:35 +01: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 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 Rouxel-Labbé 2556196dad Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-23 08:59:49 +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
Simon Giraudot ea30bcc85d Fix remaining CMakeLists.txt 2020-02-10 11:57:56 +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é 4f56fdff8e Minor addition to the SVD::Matrix concept 2019-12-10 08:19:07 +01:00
Mael Rouxel-Labbé ba1c21f3bd Enhance CGAL::Eigen_matrix 2019-12-09 18:48:46 +01:00
Mael Rouxel-Labbé 127bf54e44 Give Eigen_sparse_matrix its own file
The idea is that it is clearer that Eigen_matrix exists
2019-12-09 16:39:19 +01:00
Mael Rouxel-Labbé 51e965e1dc Rewrite most of OBB code to fix design issues and bugs 2019-12-09 12:25:38 +01:00
Mael Rouxel-Labbé b76ce69489 Fix two solvers not showing up in documentation 2019-12-04 12:00:33 +01:00
Mael Rouxel-Labbé cd4123bf2c Clean code (partial) 2019-12-04 11:33:36 +01:00
Mael Rouxel-Labbé edefc616f3 Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2019-12-03 16:28:19 +01:00
Mael Rouxel-Labbé 9ed1a87905 Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2019-10-20 20:45:49 +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 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
Maxime Gimeno be306a3584 Fix the blue line in testsuite 2019-07-09 15:03:44 +02:00
Maxime Gimeno d75842159b Fix warnings in tests and examples 2019-07-02 11:39:53 +02:00
Liangliang Nan f41848dc3b fixed two typos and removed an unnecessary include directory in CMakeLists files 2019-07-01 15:34:23 +02:00
Maxime Gimeno 44327dbde8 Hide all implem in #ifndef doxygen_running to silent all doxygen warnings. 2019-07-01 15:05: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 e95f687d58 set the find_package() QUIET 2019-06-27 09:30:52 +02:00
Maxime Gimeno 5014906e25 Fix add_definitions 2019-06-26 10:30:30 +02:00
Maxime Gimeno f31e0bee83 Fix CMakeLists for the right CMAKE versions. 2019-06-26 10:04:03 +02:00
Liangliang Nan 0c3c661458 added namespace "CGAL::" to avoid name conflicts. 2019-06-25 14:22:28 +02:00
Liangliang Nan 4588ba5d9d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-19 15:08:53 +02:00
Liangliang Nan 010f05dfeb find GLPK
- added FindGLPK.cmake
- try to find SCIP first. If not, try to find GLPK
2019-06-19 15:02:27 +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
Maxime Gimeno b12d59dc4e Fix the test CMakeLists.txt for GLPK 2019-06-13 13:33:53 +02:00
Liangliang Nan 512a429de8 added missing <cmath> in MIP solvers 2019-06-11 16:54:13 +02:00
Liangliang Nan cd673786a5 Use LGPL-3.0+ license (to be consistent with other parts) 2019-06-11 13:58:18 +02:00
Liangliang Nan e4ea59e852 fixed a typo 2019-06-06 10:01:20 +02:00
Liangliang Nan d4b4640139 corrected references (using the new names of the packages) 2019-06-06 00:30:01 +02:00
Liangliang Nan 3ffc43df9d tests if SCIP exists before creating the project 2019-06-05 21:32:10 +02:00