Commit Graph

39 Commits

Author SHA1 Message Date
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01:00
Laurent Rineau dbe12c20ee Merge pull request #7072 from afabri/CGAL-cmake-3_25-GF
CGAL: Fixes for cmake 3.25

# Conflicts:
#	Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
#	Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
#	Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt
#	Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
#	Shape_regularization/examples/Shape_regularization/CMakeLists.txt
#	Shape_regularization/test/Shape_regularization/CMakeLists.txt
#	Weights/examples/Weights/CMakeLists.txt
#	Weights/test/Weights/CMakeLists.txt
2022-12-05 12:22:44 +01:00
Andreas Fabri d157adcb6e CGAL: Fixes for cmake 3.25 2022-11-23 08:27:39 +00:00
Mael Rouxel-Labbé 6f187f332c Misc minor fixes/improvements 2022-09-14 14:08:23 +02:00
Mael Rouxel-Labbé e93b0b28eb Misc trivial cleaning 2022-09-06 16:25:47 +02:00
Mael Rouxel-Labbé 4fc486b195 Purge CMakeLists.txts from obsolete code / noise 2022-09-06 16:19:11 +02:00
Mael Rouxel-Labbé 7cb21c24b0 Uniformize message() for missing 3rd party libraries
STATUS for non-essential, NOTICE for important stuff
2022-09-06 16:07:31 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +01:00
Sébastien Loriot 58181afcdb remove useless include directives 2021-11-09 10:16:12 +01:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Sébastien Loriot bc161f2ae9 Merge 'CGAL-Eigen3_support-5.2' 2021-01-15 10:59: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 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Mael Rouxel-Labbé 2d49f7d702 Countless IO fixes...
Don't have the patience to split it nicely
2020-06-21 12:03:28 +02:00
Maxime Gimeno ea53a8d70d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-06-17 14:25:21 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Maxime Gimeno 69a2a23cc6 rename IO functions in point_set packages 2020-04-01 14:33:14 +02: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
Simon Giraudot fc38901c56 Change CMakeLists.txt to avoid message in testsuite 2020-03-02 17:08:32 +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
Simon Giraudot b97237b2b1 Test Polygonal Reconstruction partially even if solvers are not available 2019-08-08 16:22:14 +02:00
Maxime Gimeno 4cdfecc8c5 A 2019-07-03 10:27:14 +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 2342cd488e Remove second find_package(SCIP) 2019-07-01 15:08:49 +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 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
Maxime Gimeno b12d59dc4e Fix the test CMakeLists.txt for GLPK 2019-06-13 13:33:53 +02:00
Liangliang Nan 49388c1bee updated file names 2019-06-11 10:23:11 +02:00
Liangliang Nan 3b9c73c917 using the new Shape_detection implementation (instead of the deprecated Shape_detection_3) 2019-06-05 21:10:39 +02:00
Liangliang Nan fadaee63a8 integrated PolyFit 2019-06-05 17:50:37 +02:00