Laurent Rineau
5759a800e3
Merge pull request #5705 from maxGimeno/CGAL-Clean_up_boost_versions-maxGimeno
2021-07-28 10:14:38 +02:00
Laurent Rineau
4fb90756da
Merge pull request #5475 from sloriot/gsoc2019-PMPHDist-martinskrodzki
...
[Small Feature] Add bounded error Hausdorff distance
2021-07-27 16:28:04 +02:00
Laurent Rineau
b1ccf3fee3
Merge pull request #5402 from mglisse/mt-glisse
...
Epeck thread safety
2021-07-27 15:55:25 +02:00
Laurent Rineau
b9743fffa3
Merge pull request #5741 from danston/Solvers-add_osqp-danston
...
[Small Feature] OSQP Support in Solver Interface
2021-07-27 15:55:23 +02:00
Maxime Gimeno
97cac65a86
Fix __GNUC__ tests
2021-07-23 10:59:49 +02:00
Laurent Rineau
af14540751
Use THREADS_PREFER_PTHREAD_FLAG
2021-07-22 17:05:43 +02:00
Sébastien Loriot
f153a1ed3e
Merge remote-tracking branch 'cgal/master' into HEAD
2021-07-22 13:15:22 +02:00
Laurent Rineau
f9444fa85d
CGAL depends on threads-support... for all compilers!
2021-07-21 11:03:36 +02:00
Laurent Rineau
5b0e0936d5
Set CMP0064 to fix #5857
2021-07-20 11:52:18 +02:00
Marc Glisse
e7357ac003
Merge remote-tracking branch 'cgal/master' into mt-glisse
...
several PRs in Filtered_kernel conflicted with this :-(
2021-07-19 14:53:27 +02:00
Maxime Gimeno
a3d1765ab4
Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno
2021-07-19 14:18:40 +02:00
Dmitry Anisimov
aaf55dbaa0
Merge remote-tracking branch 'maxGimeno/PMP-compare_faces_from_meshes-maxGimeno' into gsoc2019-PMPHDist-martinskrodzki
2021-06-18 14:45:24 +02:00
Dmitry Anisimov
94b75803c0
Merge branch 'master' into Solvers-add_osqp-danston
2021-06-18 10:02:11 +02:00
Laurent Rineau
530616534a
Fix and document the CMake CGAL_HAS_NO_THREADS option
2021-06-16 17:12:59 +02:00
Laurent Rineau
f0ba5bc7c6
Merge pull request #5768 from alefy/CMake-Fix_OpenMesh-alefy
...
Set CMake imported OpenMesh library as INTERFACE
2021-06-16 15:04:48 +02:00
Laurent Rineau
94d1be2a79
Merge pull request #5768 from alefy/CMake-Fix_OpenMesh-alefy
...
Set CMake imported OpenMesh library as INTERFACE
2021-06-16 15:03:42 +02:00
Laurent Rineau
aa6dbfe4f2
Make CGAL unconditionally depend on Threads::Threads
2021-06-15 12:56:25 +02:00
Adrien Lefieux
b6a34b2bc5
Set CMake imported OpenMesh library as INTERFACE
2021-06-08 16:53:13 +02:00
Laurent Rineau
b935f4daa6
Merge pull request #5732 from janetournois/Polyhedron_demo-fix_cmakelists_find_tbb-jtournois
...
FindTBB.cmake: only search TBB in Config mode if version >= 2019 update 5
2021-06-02 17:21:05 +02:00
Laurent Rineau
5cbadbede6
Merge pull request #5701 from maxGimeno/Ctest-Adapt_scripts_to_windows-maxGimeno
...
Testsuite: Adapt ctest scripts for use with cygwin
2021-06-02 17:20:49 +02:00
Laurent Rineau
d99fa2517e
Merge branch '5.1.x-branch' into 5.2.x-branch
2021-06-02 17:19:45 +02:00
Dmitry Anisimov
267a6412ac
initial commit with the new osqp solver concept
2021-05-31 14:01:08 +02:00
Jane Tournois
321e8293af
fix outdated code
...
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-05-28 14:55:14 +02:00
Jane Tournois
525271c25e
start by looking for TBB_ROOT (env or cmake variable) and TBB_DIR (cmake variable)
...
and fix 2019 Update 5 version number
2021-05-28 12:20:37 +02:00
Jane Tournois
8d4f14735b
workaround a bug of earlier versions of TBB
...
Laurent said :
"That is a bug in earlier versions of TBB. It was fixed in TBB 2019 update 5. That is a bad interaction with #5687 , that made the module FindTBB.cmake from CGAL search for TBB in Config mode, first."
2021-05-27 15:06:56 +01:00
Maxime Gimeno
0e9d4bf956
Fixes in CMake
2021-05-20 12:17:48 +02:00
Laurent Rineau
10efadb510
Merge pull request #5687 from maxGimeno/CMake-Fix_FindTBB-maxGimeno
...
First search for TBB in config mode
2021-05-18 17:32:11 +02:00
Laurent Rineau
e25c58d180
Merge pull request #5687 from maxGimeno/CMake-Fix_FindTBB-maxGimeno
...
First search for TBB in config mode
2021-05-18 17:06:56 +02:00
Maxime Gimeno
e6c767d5c9
Simplify the GNUC versions tests
2021-05-12 15:45:07 +02:00
Maxime Gimeno
b61f458cff
USe the command
2021-05-11 14:56:16 +02:00
Maxime Gimeno
827a5ae8aa
review
2021-05-11 14:40:40 +02:00
Maxime Gimeno
889119e800
Update add_test to directly use msbuild when running on cygwin
2021-05-11 12:48:44 +02:00
Maxime Gimeno
74b3504879
First search for TBB in config mode
2021-05-06 14:41:08 +02:00
Dmitry Anisimov
3c0fc281e8
more optimizations, using boost any and factoring out kd tree, adding metis check
2021-05-05 13:17:23 +02:00
Sébastien Loriot
39367c2313
Merge remote-tracking branch 'cgal/5.2.x-branch'
2021-04-17 11:14:29 +02:00
Sébastien Loriot
cbd95907cd
Merge remote-tracking branch 'cgal/5.1.x-branch' into HEAD
2021-04-17 11:11:28 +02:00
Laurent Rineau
a6a16d14ab
Fix the bug on Windows
2021-04-08 17:53:41 +02:00
Laurent Rineau
8dc3256685
Merge pull request #5488 from sgiraudot/Classification-Remove_TensorFlow_support-GF
...
[Small Feature] Remove TensorFlow support
2021-04-06 15:13:15 +02:00
Maxime Gimeno
e5bf52d9c6
fix indentation and remove GMP_LIBRARIES_DIR
2021-04-02 14:56:50 +02:00
Maxime Gimeno
9a4d495567
don't use generator expression
2021-04-02 14:47:46 +02:00
Maxime Gimeno
c5ebd7c88e
dichotomize multiconfig generators
2021-04-02 14:30:02 +02:00
Maxime Gimeno
16ee70bb12
Use a generator expression to determine the lib to use
2021-04-02 14:11:23 +02:00
Maxime Gimeno
87bb3b27d1
Split GMP_LIBRARIES into debug and release.
2021-04-02 12:56:05 +02:00
Guillaume Damiand
751fb3851d
Merge branch 'master' into CGAL_data-gdamiand
2021-03-19 13:47:37 +01:00
Guillaume Damiand
d140e5b89d
Add CGAL::Data target; link exe with this target in the create_single_source_cgal_program function.
2021-03-19 13:45:04 +01:00
Sébastien Loriot
887b7d0eaa
add METIS cmake support file
2021-03-18 14:58:04 +01:00
Sébastien Loriot
ac15312260
add Ceres support cmake file
2021-03-18 14:47:56 +01:00
Simon Giraudot
8264096ee7
Remove TensorFlow support from Classification
2021-02-23 08:52:02 +01:00
Laurent Rineau
7edf0f2458
Merge pull request #5350 from maxGimeno/PSP_3-Fixes-for_pointmatcher-maxGimeno
...
PSP_3: Fix pointmatcher support
2021-02-18 15:26:22 +01:00
Laurent Rineau
fa1a355751
Merge branch '5.1.x-branch' into 5.2.x-branch
2021-02-18 15:19:05 +01:00
Laurent Rineau
7d760d8a72
Merge pull request #5350 from maxGimeno/PSP_3-Fixes-for_pointmatcher-maxGimeno
...
PSP_3: Fix pointmatcher support
2021-02-18 15:18:08 +01:00
Sebastien Loriot
913d6a608d
Update Installation/cmake/modules/CGALConfig_binary.cmake.in
...
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-02-12 10:10:17 +01:00
Sébastien Loriot
6e3828f10c
add in .in files
2021-02-12 08:44:14 +01:00
Sébastien Loriot
3cefeeb23c
set CGAL_DATA_DIR in CGALconfig.cmake
2021-02-11 19:18:57 +01:00
Maxime Gimeno
08ea69f57c
More remaining xml
2021-02-10 13:43:25 +01:00
Laurent Rineau
7d526225af
Merge pull request #5388 from maxGimeno/Ipeets-Fix_after_merge-maxGimeno
...
CGAL_Ipelets: Fix after merge in master.
2021-02-05 16:10:15 +01:00
Sébastien Loriot
a7ed934523
add missing quotes
2021-02-04 11:53:19 +01:00
Sébastien Loriot
6197135ba8
set CGAL_DATA_DIR for ctest and cmd files
2021-02-04 11:10:48 +01:00
Maxime Gimeno
89d199616b
Remove remaining not header_only code
2021-01-29 15:56:13 +01:00
Maxime Gimeno
4ed3b0129c
make the dependencies to boost general, not just for windows
2021-01-25 15:35:27 +01:00
Maxime GIMENO
c5da5251b1
Update Installation/cmake/modules/FindIPE.cmake
...
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-01-25 14:54:00 +01:00
Maxime Gimeno
01374debeb
Drop Ipe 6 support
2021-01-25 13:39:36 +01:00
Laurent Rineau
ca9febf3b8
Merge pull request #5063 from maxGimeno/CMake-modernization-maxGimeno
...
CMake modernization
# Conflicts:
# CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
2021-01-22 15:25:54 +01:00
Maxime Gimeno
9ac0a1de04
Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno
2021-01-18 11:52:30 +01:00
Maxime Gimeno
99a31e07fe
Move the Boost components in the support file and condition it to windows.
2021-01-15 14:07:17 +01: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
fa22cd972b
Change libpointmatcher_support so it won't fail when old boost has been used to build pointmatcher.
2021-01-14 13:58:15 +01:00
Maxime Gimeno
2255f8e8ea
Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno
2021-01-13 14:34:09 +01:00
Maxime Gimeno
232327c81c
Set LAS as system headers to skip warnings in testsuite
2021-01-11 09:55:30 +01:00
Laurent Rineau
d6f76d4f87
Merge pull request #5299 from maxGimeno/Checks_in_github-maxGimeno
...
CI: Add Checks in GitHub Actions
2021-01-06 16:11:08 +01:00
Laurent Rineau
fee181b6eb
Merge pull request #5299 from maxGimeno/Checks_in_github-maxGimeno
...
CI: Add Checks in GitHub Actions
2021-01-06 16:04:47 +01:00
Maxime Gimeno
fc4fc891e7
Fix dependencies
2020-12-29 14:33:49 +01:00
Maxime Gimeno
f6874b2d31
Add checks for pushes
2020-12-29 14:33:29 +01:00
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
Maxime Gimeno
7bdc5d11a9
Post-review
2020-10-15 15:03:20 +02:00
Maxime Gimeno
fcb6419106
WIP CGAL_qt5
2020-10-13 15:36:44 +02:00
Maxime Gimeno
2ed89ef35e
simplify CGAL_setup dependencies.
2020-10-12 12:24:13 +02:00
Maxime Gimeno
0f46df37df
Restore GLOB
2020-10-12 11:11:04 +02:00
Maxime Gimeno
fb39fc71ac
Revert most changes to the cgal_use_file
2020-10-09 12:55:25 +02:00
Maxime Gimeno
af5d1ee535
fix list
2020-10-09 11:16:23 +02:00
Maxime Gimeno
fe75ee4ee6
restore CMP0077
2020-10-08 13:42:42 +02:00
Maxime Gimeno
221bbdd4b1
remove CMP code now that we only support from cmake 3.13
2020-10-08 12:31:41 +02:00
Maxime Gimeno
733c487cc2
Fix file(GLOB...) in Installation/CMakeLists
2020-10-08 11:01:18 +02:00
Maxime Gimeno
616574e5ab
Modernize CMake scripts
2020-10-06 15:44:41 +02:00
Maxime Gimeno
39f97ca56b
remove NOT CGAL_HEADER_ONLY
2020-10-05 15:44:05 +02:00
Maxime Gimeno
fa2e8ec0a4
remove WITH_XXX cache options
2020-10-05 15:19:55 +02:00
Maxime Gimeno
27589e4b26
Remove preconfigured 3rd party libs options
2020-10-05 14:37:38 +02: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