Laurent Rineau
fb9333f0d0
Merge pull request #6028 from MaelRL/CGAL-Fix_typos-GF
...
Fix typos
2021-10-07 14:27:21 +02:00
Marius Kintel
3f369718be
Bugfix: ORIGINAL_CMAKE_MODULE_PATH was set to PARENT_SCOPE and later referenced in the current scope
...
In the `cgal_setup_module_path` function, the intent is to set a few variables then later export them.
The ORIGINAL_CMAKE_MODULE_PATH variable, however, was set directly in the parent scope. When later trying to export it, it reads from the current scope, where the variable is empty as it hasn't yet been set.
This fix makes correctly sets the variable in the local scope the first time, making the export work as expected.
2021-10-04 16:13:30 -04:00
Mael Rouxel-Labbé
521c72d57e
Fix typos
2021-10-04 13:34:07 +02:00
Laurent Rineau
458fa7c280
Merge pull request #6007 from lrineau/Installation-fix_CGAL_pointmatcher_support.cmake-GF
...
Fix CGAL_pointmatcher_support.cmake
2021-09-29 11:46:36 +02:00
Laurent Rineau
e5ab9202f5
Merge pull request #4229 from gdamiand/CGAL_data-gdamiand
...
Regroup data: scripts and function updates
2021-09-23 16:14:11 +02:00
Laurent Rineau
9e30160ad0
Fix CGAL_pointmatcher_support.cmake
...
Fix https://github.com/CGAL/cgal/issues/5346
The quotes around `${libpointmatcher_LIBRARIES}` are harmful.
2021-09-22 14:39:34 +02:00
Sébastien Loriot
78b0b2afbd
add target def in generated files for install
2021-09-16 11:40:57 +02:00
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