Laurent Rineau
41211e308b
Merge branch '5.1.x-branch'
2020-10-28 09:52:34 +01:00
Laurent Rineau
6007fe7c04
Merge branch 'releases/CGAL-5.0-branch' into 5.1.x-branch
2020-10-28 09:51:02 +01:00
Laurent Rineau
27d585438b
Support non-header-only
2020-10-27 09:16:53 +01:00
Laurent Rineau
14f27a2b41
Fix CTest issues with CGAL_Qt5
...
Add a target `compilation_of__CGAL_Qt5_moc_and_resources`, and a
corresponding CTest test, so that `CGAL_Qt5_moc_and_resources` is
always compiled first, when needed. That will fix CTest
race-conditions, where `CGAL_Qt5_moc_and_resources` was being compiled
by several CTest test at the same time.
2020-10-26 13:52:33 +01:00
Sebastien Loriot
af260a3156
Merge pull request #4869 from maxGimeno/CGAL-CMake_testsuite-maxGimeno
...
Add a testsuite for CMake
2020-10-02 15:21:47 +02:00
Sebastien Loriot
9e4970faef
Merge pull request #4781 from lrineau/Mesh_3-ITT_support-GF
...
Add ITT support in Mesh_3
2020-10-02 15:20:04 +02:00
Maxime Gimeno
1be84a948f
Copy resource files when building the demo from installation
2020-09-30 12:03:05 +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
Laurent Rineau
5ae732d241
Trivial fix: MPFI needs MPFR
2020-07-22 10:23:30 +02:00
Laurent Rineau
8a7d3fa21e
CGAL_Core no longer needs Boost.Thread
2020-07-21 17:32:30 +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
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
2e912d4cb2
Merge branch 'master' into Mesh_3-ITT_support-GF
2020-07-08 16:22:58 +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
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
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
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
Laurent Rineau
dc4427c998
Move the code in CGAL_SetupCGALDependencies.cmake
2020-05-28 12:44:25 +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
Dmitry Anisimov
69d174571a
added the missing macros include
2020-05-25 11:25:01 +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
Simon Giraudot
5a95259849
Fix for cmake > 3.11
2020-05-18 13:40:31 +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
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
Dmitry Anisimov
2ef4e362c1
integrated review for the fix
2020-05-11 11:29:54 +02:00
Laurent Rineau
4092727cf8
Fix CGAL_parse_version_h.cmake when the minor version is less than 10
2020-05-06 13:36:38 +02:00
Sebastien Loriot
0325219ce6
Merge pull request #4671 from maxGimeno/DGAL-Fix_MIN_MAX_issues-maxGimeno
...
CGAL: Min-max errors on windows
2020-04-27 09:46:04 +02:00
Sebastien Loriot
e38f9c2195
Merge pull request #4633 from maxGimeno/Three-move_examples-maxGimeno
...
Three: Move examples to the Polyhedron_Demo
2020-04-22 13:20:32 +02:00
Maxime Gimeno
5b2d46cfa0
Fixes for min/max
2020-04-21 12:04:45 +02:00
Maxime Gimeno
50766d9d03
Fixes for min/max
2020-04-21 11:52:56 +02:00
Maxime Gimeno
e9d41d7b7d
Fixes for min/max
2020-04-21 11:38:37 +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
3668a22d89
Update deprecation warnings
2020-04-15 14:06:13 +02:00
Simon Giraudot
421096fd7f
Use imported targets everywhere
2020-04-15 14:06:13 +02:00
Simon Giraudot
41519e3010
Proposal for imported targets
2020-04-15 14:05:18 +02:00
Maxime Gimeno
55f7ed028c
Add file to whitelist
2020-04-09 15:05:22 +02:00
Simon Giraudot
7cfe6df8e3
Allow classification package to be used without Boost IO Stream and Serialization
2020-04-07 11:02:16 +02:00