Commit Graph

4019 Commits

Author SHA1 Message Date
Laurent Rineau a8ed7408c3 Prepare for a beta3 and let's hope it will not be needed 2020-07-28 11:24:19 +02:00
Maxime Gimeno 65cda18aab Specify install path for the libs 2020-07-27 11:47:15 +02:00
Maxime Gimeno 619c8db731 Fix tests find_package 2020-07-27 11:27:21 +02:00
Maxime Gimeno 61e31c6412 Fix paths and restore original tests for cgal_version 2020-07-27 10:34:10 +02:00
Maxime Gimeno 696c8eb165 Add " around all paths 2020-07-24 16:25:19 +02:00
Laurent Rineau ac5b6ffcb8
Merge pull request #4877 from lrineau/CGAL-CGALConfigVersion__fixes-GF
CMake: Fix a bug in PR #4850
2020-07-24 15:54:51 +02:00
Laurent Rineau 1ffbd83480 Fix a bug
```
== CMake setup ==
CMake Warning (dev) at Installation/lib/cmake/CGAL/CGALConfigVersion.cmake:6 (set):
  Cannot set "CGAL_MAJOR_VERSION": current scope has no parent.
Call Stack (most recent call first):
  CGALConfigVersion.cmake:1 (include)
  CMakeLists.txt:13 (include)
This warning is for project developers.  Use -Wno-dev to suppress it.

```
2020-07-23 18:24:06 +02:00
Laurent Rineau c788d66761 Merge pull request #4860 from lrineau/CGAL-CGALConfigVersion__fixes-GF
CGALConfigVersion... fix #4850
2020-07-23 17:15:09 +02:00
Laurent Rineau c98978a62f Merge pull request #4864 from lrineau/CGAL_Core-fix_memory_pool_issue-GF
CGAL_Core: fix a long-standing bug ( !blocks.empty() )
2020-07-23 17:15:07 +02:00
Laurent Rineau f2da5cdb1a Merge pull request #4859 from sgiraudot/Installation-Fix_cmake_module_IO_streams-GF
Fix CMake module for Boost IO Streams
2020-07-22 16:54:39 +02:00
Maxime Gimeno ef6cf3347a Add a cgal_test_with_cmake script 2020-07-22 16:34:55 +02:00
Maxime Gimeno 15c407081a Don't use -S and -B (cmake >=3.13) 2020-07-22 14:42:12 +02:00
Maxime Gimeno 88f0734749 Fix cgal_dirs 2020-07-22 14:12:17 +02:00
Maxime Gimeno cdaa213272 Add a label 2020-07-22 13:34:11 +02:00
Maxime Gimeno 608b0cb917 Add compilation and execution tests and missing files. 2020-07-22 13:13:41 +02:00
Maxime Gimeno 241d477efd Add tests in both travis and the Installation/tests. 2020-07-22 12:44:18 +02:00
Laurent Rineau 5ae732d241 Trivial fix: MPFI needs MPFR 2020-07-22 10:23:30 +02:00
Laurent Rineau 23f8f46b31 Fix for the tests in test/Installation/CMakeLists.txt 2020-07-21 18:05:01 +02:00
Laurent Rineau 5588cdfcd7 Bug! Install CGALConfigBuildVersion.cmake with the other files 2020-07-21 18:04:49 +02:00
Laurent Rineau 8a7d3fa21e CGAL_Core no longer needs Boost.Thread 2020-07-21 17:32:30 +02:00
Maxime Gimeno f504e45509 WIP tests in installation 2020-07-21 17:01:53 +02:00
Laurent Rineau 022b1a71d0 Merge branch 'releases/CGAL-5.0-branch' 2020-07-21 15:27:49 +02:00
Laurent Rineau 2e8a59d570 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-07-21 15:25:54 +02:00
Laurent Rineau ed377100ee Read CGAL_BUILD_VERSION from another file
That allows the release creation script to fill that number.
2020-07-21 11:57:12 +02:00
Laurent Rineau 63b5b30fdf No longer parse CGAL/version.h to get the version numbers 2020-07-21 11:24:09 +02:00
Laurent Rineau 80daf54be1 Remove leading zeros in CGAL_BUILD_VERSION: 1 instead of 001 2020-07-21 11:23:22 +02:00
Simon Giraudot bb4fda240c Fix INTERFACE_LINK_LIBARIES which should be a semicolon-separated string 2020-07-21 11:02:45 +02:00
Maxime Gimeno 26c28abe68 Add a fake function for cgal_add_compilation_test 2020-07-20 09:55:54 +02:00
Laurent Rineau ebdf7b2c04 Fix a compiler with the no_unique_address attribute, in C++03 2020-07-17 09:53:07 +02:00
Andreas Fabri 6358c82ef7 Add change entry 2020-07-15 11:16:39 +01:00
Maxime Gimeno 24214def33 Add some tests in Installation for travis. 2020-07-09 15:47:43 +02:00
Laurent Rineau 72d280fdd9 Merge pull request #4803 from janetournois/Tet_remeshing-from_c3t3_input-jtournois
Tetrahedral remeshing from C3T3
2020-07-08 16:24:42 +02:00
Laurent Rineau 2e912d4cb2 Merge branch 'master' into Mesh_3-ITT_support-GF 2020-07-08 16:22:58 +02:00
Jane Tournois 5b474e0075 replace deprecated std::not1 by std::not_fn
std::not1 is deprecated in C++17 and removed from C++20

+ add a C++17 macro in config.h
2020-07-07 10:49:58 +02:00
Jane Tournois 1b7b19b451 silent a warning from boost and C++17 2020-07-06 13:50:55 +02:00
Laurent Rineau e413105625 Merge branch 'master' into Installation-remove_code_about_REFERENCE_CACHE_DIR-GF 2020-07-02 15:51:57 +02:00
Laurent Rineau abd53906c5 Remove trailing whitespaces 2020-07-02 15:51:29 +02:00
Laurent Rineau 80dd558884 Display the compiler version in test results
I commit directly to `master`, because there is no way to test that in
`integration`.
2020-07-02 15:50:49 +02:00
Laurent Rineau 0e6302d1d5 Remove CGAL_REFERENCE_CACHE_DIR
That no longer works with header-only, anyway. Now we use the option
`-C` of CMake, with a small file loaded from the environment variable
`INIT_FILE`.
2020-07-02 15:02:20 +02:00
Jane Tournois b519de793b replace BOOST_MSVC by _MSC_VER
The problem was that BOOST_MSVC is defined by <boost/config.hpp>, that is included later.
2020-07-02 13:59:41 +02:00
Efi Fogel d73a944fa4 Replaced legacy CGAL::Object with modern boost::variant. 2020-06-30 21:51:42 +03:00
Efi Fogel df5a029deb - Changed Make_x_monotone_2::operator()() return type from legacy CGAL::Object to modern boost::variant 2020-06-29 10:02:40 +03:00
Laurent Rineau dad9db1094 Merge pull request #4774 from lrineau/CGAL-remove_cpp11-GF
Remove cpp11::(tuple|get)
2020-06-23 18:50:17 +02:00
Laurent Rineau 274032be38 Merge remote-tracking branch 'cgal/master' into Aos_2-remove_object-efif 2020-06-15 09:31:26 +02:00
Efi Fogel 17911cbfd8 Changed make-x-monotone of the 2D Arrangement package to use variant instead of legacy Object 2020-06-14 11:26:11 +03:00
Laurent Rineau 4d3cd32176 Fix Travis error about a non-UTF8 character 2020-06-12 10:24:37 +02:00
Laurent Rineau 25710329ac Add ITT support in Mesh_3 2020-06-11 14:56:04 +02:00
Laurent Rineau d127be9d84 Second draft of the announcement mail, after a collaborative edition 2020-06-10 11:59:54 +02:00
Laurent Rineau 0f63849a43 First draft for the announcement mail 2020-06-10 10:09:01 +02:00
Laurent Rineau ec6c0d6758 Prepare for 5.1-beta2 2020-06-09 22:15:45 +02:00
Laurent Rineau 52b83a9316 Merge remote-tracking branch 'cgal/master' into CGAL-remove_cpp11-GF 2020-06-09 20:14:42 +02:00
Laurent Rineau ec1dd745e0 Remove cpp11::(tuple|get)
And use `#ifdef CGAL_NO_DEPRECATED_CODE` around the backward
compatibility code in `<CGAL/config.h>`.
2020-06-09 20:11:45 +02:00
Laurent Rineau 9b8ecd720b Merge pull request #4636 from sgiraudot/CMake-Third_party_imported_targets-GF
CMake: Use Imported Targets for 3rd Party Libs
2020-06-05 17:54:14 +02:00
Laurent Rineau a52a52dd3b Merge pull request #4714 from MaelRL/CGAL-Format_CHANGES.md_5.1-GF
Fix a number of issues in CHANGES.md and add links for 5.1
2020-06-05 17:54:11 +02:00
Laurent Rineau daf86cc719 Prepare for 5.1-beta1 2020-06-04 09:42:02 +02:00
Mael Rouxel-Labbé e49babecfb Formatting... 2020-06-03 17:50:08 +02:00
Mael Rouxel-Labbé 6607b48dda Add an entry in CHANGES.md about the tutorials 2020-06-03 17:47:55 +02:00
Mael Rouxel-Labbé d81184ca9f Add links to entries on cgal.org 2020-06-03 17:47:40 +02:00
Mael Rouxel-Labbé 09fa7feef2 Misc minor fixes 2020-06-03 17:39:29 +02:00
Mael Rouxel-Labbé 02f8063111 Add Tetrahedral Remeshing to CHANGES.md 2020-06-03 17:27:44 +02:00
Mael Rouxel-Labbé 4a9618f62c Add missing links 2020-06-03 17:11:38 +02:00
Mael Rouxel-Labbé 97bebb5b0f Merge remote-tracking branch 'cgal/master' into CGAL-Format_CHANGES.md_5.1-GF 2020-06-03 17:01:40 +02:00
Laurent Rineau a828cb0d06 Merge pull request #4620 from janetournois/Tetrahedral_remeshing-new-jtournois
Tetrahedral remeshing - new package
2020-06-03 16:23:17 +02:00
Laurent Rineau 8db4503904 Merge pull request #4710 from danston/CGAL-clangmp_bug_fix-danston
boost mp on Apple clang issue fix

# Conflicts:
#	Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake
2020-06-03 16:22:55 +02:00
Laurent Rineau 4354b2c87f Merge pull request #4710 from danston/CGAL-clangmp_bug_fix-danston
boost mp on Apple clang issue fix
2020-06-03 16:21:28 +02:00
Laurent Rineau 4dba18fe9d Merge pull request #4710 from danston/CGAL-clangmp_bug_fix-danston
boost mp on Apple clang issue fix
2020-06-03 16:11:23 +02:00
Maxime Gimeno 3356d066cc fix boost zlib targets 2020-06-02 15:31:55 +02:00
Maxime Gimeno 4af1e73f69 Work around for moc bug 2020-06-02 10:12:10 +02:00
Laurent Rineau dc4427c998 Move the code in CGAL_SetupCGALDependencies.cmake 2020-05-28 12:44:25 +02:00
Simon Giraudot b2fe891802 Fix cmake 2020-05-28 08:59:18 +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
Laurent Rineau 7173530dad Merge pull request #4557 from lrineau/NewKernel_d-det-GF-CGAL-5.0
NewKernel_d: Accelerate by using Mpzf instead of Gmpq (CGAL-5.0 and later)
2020-05-27 18:27:56 +02:00
Laurent Rineau 88250aee80 Merge pull request #4557 from lrineau/NewKernel_d-det-GF-CGAL-5.0
NewKernel_d: Accelerate by using Mpzf instead of Gmpq (CGAL-5.0 and later)
2020-05-27 18:20:14 +02:00
Laurent Rineau b4f2295bab Merge pull request #4555 from afabri/NewKernel_d-det-GF
NewKernel_d: Accelerate by using Mpzf instead of Gmpq (for CGAL-4.14.x)
2020-05-27 18:15:30 +02:00
Laurent Rineau b294b39d7e Merge pull request #4709 from maxGimeno/Surface_mesh-Clear_removes_the_maps-maxGimeno
Surface_mesh: fix clear()
2020-05-27 16:33:30 +02:00
Dmitry Anisimov 69d174571a added the missing macros include 2020-05-25 11:25:01 +02:00
Maxime Gimeno 3ab72f217a Add 'breaking change' to the change log 2020-05-25 09:07:48 +02:00
Laurent Rineau 0e3db8c815 Merge pull request #4659 from sgiraudot/PSP-Enhance_remove_outliers-GF
[Small Feature] Parallel Outlier Removal
2020-05-22 16:39:32 +02:00
Laurent Rineau b70dcffbd7 Merge pull request #4697 from lrineau/Installation-add_CGALConfigVersion-GF
header-only mode: add CGALConfigVersion.cmake
2020-05-22 16:39:28 +02:00
Laurent Rineau f27ea0bfb3 Merge pull request #4737 from jingyangcarl/master
add include of other modules
2020-05-22 16:39:25 +02:00
Laurent Rineau 851c67a740 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-05-22 16:39:00 +02:00
Laurent Rineau a56a052bca Merge pull request #4743 from AdrianBunk/CGAL-5.0-branch
Fix gcc option setting for Alpha
2020-05-22 10:35:56 +02:00
Adrian Bunk 5e70fceba9 Fix gcc option setting for Alpha 2020-05-22 11:21:58 +03:00
Jing Yang b495c00450 add include of other modules 2020-05-19 23:42:56 -07:00
Laurent Rineau 6b05f820e7 Markdown formatting of code 2020-05-19 20:28:29 +02:00
Laurent Rineau 3d3788925b Merge pull request #4607 from efifogel/Aos_2-intersection-efif
Arrangement_on_surface_2: change intersection return types (from legacy CGAL::Object to variants)

# Conflicts:
#	Installation/CHANGES.md
2020-05-19 10:55:30 +02:00
Simon Giraudot 700631da33 Update CHANGES.md 2020-05-18 13:56:31 +02:00
Simon Giraudot 5a95259849 Fix for cmake > 3.11 2020-05-18 13:40:31 +02:00
Maxime Gimeno 380e7c579e Update doc and CHANGES.MD 2020-05-18 12:25:28 +02:00
Laurent Rineau bb012da683 Merge pull request #4568 from sgiraudot/PSP-Cluster_points-GF
[Small Feature] Point Set Clustering
2020-05-18 12:24:56 +02:00
Laurent Rineau 81c1b96217 Merge branch 'releases/CGAL-5.0-branch' 2020-05-18 12:01:39 +02:00
Laurent Rineau 0ed0741489 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-05-18 11:59:20 +02:00
Laurent Rineau 3a2b250626 Fix a warning
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-152/Installation/TestReport_Friedrich_Ubuntu-gcc-7.gz
```
CMake Warning at /home/gimeno/foutoir/cgal_root/CGAL-5.1-Ic-152/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake:99 (message):
  =======================================================================

  CGAL performance notice:

  The variable CMAKE_BUILD_TYPE is set to "".  For performance reasons, you
  should set CMAKE_BUILD_TYPE to "Release".

  Set CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE to TRUE if you want to disable
  this warning.

  =======================================================================
Call Stack (most recent call first):
  CMakeLists.txt:9223372036854775807 (CGAL_run_at_the_end_of_configuration)
```
2020-05-18 11:43:59 +02:00
Jane Tournois b6912d92ea fix warnings
- move #define a better location
- conversion double/size_t
- unused parameters
- automatic conversion int/boolean
2020-05-15 13:54:19 +02:00
Jane Tournois 3d5fc5c1ca silent warning "STL4009: std::allocator<void> is deprecated in C++17."
from boost-1_71\boost/bimap/detail/manage_additional_parameters.hpp(86):
warning C4996: 'std::allocator<void>': warning STL4009: std::allocator<void>
 is deprecated in C++17.
You can define _SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING or
_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS
to acknowledge that you have received this warning.

see https://github.com/boostorg/beast/issues/1272
it seems that this warning is an error in msvc
2020-05-14 13:51:41 +02:00
Laurent Rineau 252b58d39f Change the version compatibility to SameMajorVersion
and change the testsuite
2020-05-14 11:26:00 +02:00
Laurent Rineau d85396c148 Make CGAL relocatable again
It will be relocatable if the user does not change
`CGAL_INSTALL_CMAKE_DIR` from its default.
2020-05-14 11:10:04 +02:00
Laurent Rineau f4cf19f64b Cosmetic: use variables from GNUInstallDirs instead of our guesses 2020-05-14 10:55:56 +02:00
Laurent Rineau f12f6f5f08 Fix #4720 2020-05-13 21:22:07 +02:00
Laurent Rineau d30dfacf5f Fix the testsuite of test/Installation/ with CTest 2020-05-13 21:15:55 +02:00