Laurent Rineau
41258bf760
Merge pull request #7963 from sloriot/CGAL-cmake_remove_exec_command
...
Use execute_process that is recommanded over exec_command since 3.0
2024-01-11 12:45:38 +01:00
Sébastien Loriot
f970b9bba4
add option to remove extra newline
2024-01-05 14:08:32 +01:00
Sébastien Loriot
0ab6971ede
use execute_process that is recommanded over exec_command since 3.0
2024-01-04 14:30:40 +01:00
Sébastien Loriot
37c792a764
fix qt6 version
2023-12-27 11:56:08 +01:00
Laurent Rineau
95b83b1214
Merge pull request #7845 from puneetmatharu/patch-cgal-dont-override-build-testing
...
Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject
2023-11-29 17:22:54 +01:00
Laurent Rineau
a8b8102567
CGAL_ENABLE_TESTING has three definitions
...
`CGAL_ENABLE_TESTING` is defined three times:
- once in `/CMakeLists.txt` that is the root of the CMake tree for a Git layout
- once in `Installation/CMakeLists.txt` that is the root of the CMake
for a release tarball,
- and once in `CGAL_add_test.cmake`, for consumers of `CGALConfig.cmake`.
Two changes:
- Add the default value `${BUILD_TESTING}` to all three definitions
- Modify the comment
2023-11-10 13:17:46 +01:00
Puneet Matharu
7944441068
Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject.
2023-11-02 18:09:03 +00:00
Laurent Rineau
b05e1e9e46
Remove UseCGAL.cmake
...
and our old CMake macros `use_lib` and `use_component`.
2023-09-14 17:32:55 +02:00
Sébastien Loriot
573de7f29e
Merge branch 'master'
2023-06-22 13:38:49 +02:00
Sébastien Loriot
bbc4d08ee0
Merge remote-tracking branch 'cgal/master' into HEAD
2023-06-15 10:47:07 +02:00
Sébastien Loriot
6df9a0d61c
check headers also needs c++17
2023-06-15 10:43:53 +02:00
Andreas Fabri
c6ce5fb120
Switch to QT6 for the GraphicsView demos
2023-04-19 12:19:38 +01:00
Mael Rouxel-Labbé
cd0c81a98a
Merge remote-tracking branch 'cgal/master' into P3M3-Undocumented_polyhedral_domain_example-GF
2023-03-20 10:14:27 +01:00
Laurent Rineau
b5e7ffdeea
Fix error with P3M3 during check_headers
...
```
#error "The header '<CGAL/Periodic_3_mesh_3/config.h>' must be included before '<CGAL/Mesh_3/config.h>
```
2022-12-12 12:09:10 +01:00
Laurent Rineau
d71f2c6fd1
Fix compilation error with recent version of VTK
2022-12-12 12:09:10 +01:00
Mael
6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF
2022-12-05 16:03:41 +01:00
Laurent Rineau
5c943e558c
Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
...
Fix autotest_cgal_with_ctest
2022-11-25 10:15:07 +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
1501d9943a
Fix the bug!
...
See the empty columns in https://cgal.geometryfactory.com/CGAL/testsuite/results-5.6-Ic-100.shtml
and the CMake output at
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.6-Ic-100/Installation/TestReport_Christo_MSVC-2022-Community-Release.gz
With `Scripts/developer_scripts/run_testsuite_with_ctest`, CMake is
called with `-DWITH_tests=ON -DCGAL_TEST_SUITE=ON`.
We do not want to disable that option `-DWITH_tests=ON` because it
is crucial for the correct behavior of `run_testsuite_with_ctest`.
2022-10-28 15:19:09 +02: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
Sébastien Loriot
950c6b75f3
remove last mention to boost ARITY
2022-09-16 14:50:30 +02:00
Mael Rouxel-Labbé
7cb21c24b0
Uniformize message() for missing 3rd party libraries
...
STATUS for non-essential, NOTICE for important stuff
2022-09-06 16:07:31 +02:00
Mael Rouxel-Labbé
28ba446895
Clean (some) CMakeLists.txt indentation
2022-09-06 15:38:18 +02:00
Laurent Rineau
2288225448
Massive update of CMake policies to version 3.23
2022-05-06 09:34:35 +02:00
Laurent Rineau
80c3baa196
/wd4503 is only for MSVC 2015
2022-05-05 16:09:51 +02:00
Laurent Rineau
84f707c7f1
Merge branch '5.3.x-branch'
2021-10-06 12:05:04 +02:00
Laurent Rineau
67546b22c9
Fix PR #5853
...
This patch actually somehow revert #5853 , and surrounds the two
`install` commands with `if(CGAL_BRANCH_BUILD)`.
2021-09-29 17:50:04 +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
5759a800e3
Merge pull request #5705 from maxGimeno/CGAL-Clean_up_boost_versions-maxGimeno
2021-07-28 10:14:38 +02:00
Sébastien Loriot
f153a1ed3e
Merge remote-tracking branch 'cgal/master' into HEAD
2021-07-22 13:15:22 +02:00
Laurent Rineau
f526f4941c
Do install demo/resources and demo/icons
...
They are copied in cmake/modules/demo/ anyway.
2021-07-15 16:28:22 +02:00
Maxime Gimeno
e6c767d5c9
Simplify the GNUC versions tests
2021-05-12 15:45:07 +02:00
Guillaume Damiand
3aa8506a43
Merge branch 'master' into CGAL_data-gdamiand
2021-04-30 17:45:20 +02:00
Maxime Gimeno
c49152359c
update max version of cmake and announce the new minimal in CHANGE.md
2021-04-15 15:08:54 +02:00
Laurent Rineau
0e49e18bd3
Merge pull request #5460 from lrineau/CGAL-as_a_CMake_subdirectory-GF
...
Allow to use CGAL as a submodule of a bigger CMake project
2021-03-24 15:05:31 +01: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
Guillaume Damiand
0939b0d1c6
Use target_compile_definitions instead of add_definitions
2021-03-16 11:32:03 +01:00
Guillaume Damiand
3557c614b9
Use CGAL_SOURCE_DIR instead of CMAKE_SOURCE_DIR
2021-03-16 10:57:49 +01:00
Maxime Gimeno
4470fe8481
fix conflicts
2021-03-09 15:51:25 +01:00
Laurent Rineau
db338aa1ee
Merge pull request #5417 from maxGimeno/Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno
...
QGLViewer: remove the need for Qt5::Xml
2021-02-18 15:19:06 +01:00
Andreas Fabri
662eab79d0
More removal of lines as suggested by Laurent
2021-02-17 10:06:16 +00:00
Maxime Gimeno
2f6a9ff599
Allow to use CGAL as a submodule of a bigger CMake project
...
The trick is to use
- `CGAL_SOURCE_DIR` instead of `CMAKE_SOURCE_DIR`, and
- `CGAL_BINARY_DIR` instead of `CMAKE_BINARY_DIR`.
See
https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_SOURCE_DIR.html
https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_BINARY_DIR.html
> This can be useful when add_subdirectory() is used to connect several projects.
2021-02-15 09:07:10 +01:00
Andreas Fabri
b1a86b749a
Update CMakeLists.txt
2021-02-12 14:44:02 +01:00
Sébastien Loriot
3cefeeb23c
set CGAL_DATA_DIR in CGALconfig.cmake
2021-02-11 19:18:57 +01:00
Maxime GIMENO
363b8400dd
Update Installation/CMakeLists.txt
...
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-02-10 08:35:07 +01:00
Maxime Gimeno
b5ead13803
add leda
2021-02-09 14:57:50 +01:00
Maxime Gimeno
602b8d6951
Restore missing deps info in installation if running testsuite
2021-02-09 14:44:16 +01:00
Maxime Gimeno
2500331070
Merge remote-tracking branch 'cgal/master' into Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno
2021-02-09 12:33:52 +01:00
Maxime Gimeno
9cd0d450f9
Remove QDomElements and need for QtXml
2021-02-09 11:31:34 +01:00