Commit Graph

1025 Commits

Author SHA1 Message Date
Laurent Rineau 25ebbab854 Fix incorrect use of string(REGEX REPLACE...) 2023-11-17 15:29:24 +01:00
Laurent Rineau 16425cc053 Merge pull request #7498 from sloriot/fix_libpointmatcher_link
Fix link issue with pointmatcher
2023-06-07 17:33:39 +02:00
Sébastien Loriot 933fe5004a link with libnabo 2023-06-05 15:46:50 +02:00
Laurent Rineau bce4c8398d Merge pull request #7456 from lrineau/Installation-upgrade_FindTBB.cmake-GF
Upgrade FindTBB.cmake
2023-06-05 14:01:28 +02:00
Laurent Rineau c02bd3cbd5 Reintroduce a search in NO_MODULE mode 2023-06-01 10:15:58 +02:00
Laurent Rineau 44a7b6a431 Upgrade FindTBB.cmake
Fixes https://github.com/CGAL/cgal/issues/7349
2023-05-19 18:36:24 +02:00
Laurent Rineau eaa2c8cd71 Merge branch '5.4.x-branch' into 5.5.x-branch 2023-05-04 16:35:30 +02:00
Laurent Rineau 28da6e7c74 CMake: allow spaces in git working directory 2023-04-26 16:24:01 +02:00
Laurent Rineau 731a774a4f Merge pull request #7386 from janetournois/Installation-gmp-jtournois
Installation - add new possible GMP lib name for MSVC
2023-04-21 11:18:56 +02:00
Jane Tournois 37c0b5eaa6 add gmp-10 as a hint for findGMP
and add GMP_DIR and MPFR_DIR as hints to find all includes and libs
2023-04-13 16:17:22 +02:00
Laurent Rineau 8fbb9c5eaf Merge pull request #7129 from sloriot/CGAL-config_clean_up
Leopard is retired for quite some time now
2023-01-27 20:52:25 +01:00
Sébastien Loriot 226c009892 Leopard is retired for quite some time now 2022-12-20 08:35:28 +01:00
Laurent Rineau b363b7e4af Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
Fix autotest_cgal_with_ctest
2022-11-25 10:14:18 +01:00
Laurent Rineau ea35fa8f88 Fix autotest_cgal_with_ctest
That commit makes the CMake variables `CGAL_TEST_SUITE` (the new one)
and `RUNNING_CGAL_AUTO_TEST` (the legacy one) completely equivalent.
2022-10-05 15:06:02 +02:00
Jane Tournois 26f44ea271 update minimal valid boost version 2022-09-15 13:50:15 +01:00
Laurent Rineau f237c761c2 Resore the requirement for CMake 3.11 2022-05-06 09:44:14 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Laurent Rineau 55a3b3f1aa Active CMake policies up to CMake-3.23 2022-05-06 09:28:17 +02:00
Laurent Rineau 80c3baa196 /wd4503 is only for MSVC 2015 2022-05-05 16:09:51 +02:00
Laurent Rineau c00c481e06 Remove workarounds for CMake<3.11 2022-05-05 16:08:51 +02:00
Sébastien Loriot cd1cdccd62 change the scope of imported targets 2021-11-02 11:01:38 +01:00
Sébastien Loriot c59405342a add target for generated files 2021-11-01 12:38:48 +01:00
Laurent Rineau ca89949169 Merge pull request #5597 from lrineau/Mesh_3-weighted_images-GF
Mesh_3: Add weighted images
2021-10-29 17:01:33 +02:00
Jane Tournois 0498cace68 add and use CGAL_ITK_support.cmake 2021-10-29 12:27:04 +02:00
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
Jane Tournois 4b3fee813f ITK is not needed in c3t3_item, and find with the required components only 2021-09-23 14:46:40 +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 4bcbcfd9f2 Change the name of whitelisted header 2021-09-14 10:51:09 +02:00
Laurent Rineau 834c9d452b Whitelist CGAL/Mesh_3/generate_weights_from_labeled_image.h
`CGAL/Mesh_3/generate_weights_from_labeled_image.h` depends on ITK and
cannot be tested automatically.
2021-07-29 10:32:00 +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