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
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
fab5d071d8
add missing export
2021-02-04 19:45:23 +01:00
Sébastien Loriot
6e06ef17c6
global data path is used when building all tests/examples/demos
2021-02-04 19:01:51 +01:00
Sébastien Loriot
1e60a142ce
update default
2021-02-04 11:53:12 +01:00
Maxime Gimeno
89d199616b
Remove remaining not header_only code
2021-01-29 15:56:13 +01:00
Maxime Gimeno
01374debeb
Drop Ipe 6 support
2021-01-25 13:39:36 +01:00
Guillaume Damiand
afa51d77d7
Set CGAL_DATA_DIR in cmake (TODO: two default directories depending if we are in the flat release or not)
2021-01-19 15:23:48 +01:00
Maxime Gimeno
a7ed8c429c
triling whitespace
2021-01-13 15:17:24 +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
83c9a00d73
Fix Conflict
2020-12-03 09:44:03 +01:00
Maxime Gimeno
b477021ad1
Remove LICENSE.FREE_USE from installation tests
2020-12-03 09:12:08 +01:00
Maxime Gimeno
7bdc5d11a9
Post-review
2020-10-15 15:03:20 +02:00
Maxime Gimeno
0c14520987
Fix CGAL_Qt5 installation
2020-10-14 11:14:58 +02:00
Maxime Gimeno
fcb6419106
WIP CGAL_qt5
2020-10-13 15:36:44 +02:00
Maxime Gimeno
27ddd9bf86
remove flags in CI
2020-10-12 15:44:44 +02:00
Maxime Gimeno
0f46df37df
Restore GLOB
2020-10-12 11:11:04 +02:00
Maxime Gimeno
9883437315
revert the GLOB rework
2020-10-09 15:59:27 +02:00
Maxime Gimeno
3aa2f81ad9
test travis.
2020-10-09 15:08:09 +02:00
Maxime Gimeno
9a90628fa5
Fix header check
2020-10-09 14:29:40 +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
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
Maxime Gimeno
9c15f2c9dc
Use FeatureSummary in the demo, and remove CGAL_FOUND
2020-08-04 12:46:17 +02:00
Laurent Rineau
5588cdfcd7
Bug! Install CGALConfigBuildVersion.cmake with the other files
2020-07-21 18:04:49 +02:00
Laurent Rineau
0e6302d1d5
Remove CGAL_REFERENCE_CACHE_DIR
...
That no longer works with header-only, anyway. Now we use the option
`-C` of CMake, with a small file loaded from the environment variable
`INIT_FILE`.
2020-07-02 15:02:20 +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
d85396c148
Make CGAL relocatable again
...
It will be relocatable if the user does not change
`CGAL_INSTALL_CMAKE_DIR` from its default.
2020-05-14 11:10:04 +02:00
Laurent Rineau
f4cf19f64b
Cosmetic: use variables from GNUInstallDirs instead of our guesses
2020-05-14 10:55:56 +02:00
Laurent Rineau
d30dfacf5f
Fix the testsuite of test/Installation/ with CTest
2020-05-13 21:15:55 +02:00
Laurent Rineau
15f0171013
Fix for the case where CGAL is configured
2020-05-06 13:36:38 +02:00
Sébastien Loriot
c5af2b25f3
Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'
2020-04-22 13:27:29 +02:00
Sébastien Loriot
157bdbda08
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
2020-04-22 13:26:52 +02:00
Maxime Gimeno
75152e76d2
Add switch in dependency script
2020-04-16 16:29:42 +02:00
Sébastien Loriot
8bb22d5b2c
extra run of the script to remove tabs and trailing whitespaces
...
right after the merge of the 5.0 release branch
+ manual fix of the files (indentation was changed in the meantime):
* Spatial_sorting/include/CGAL/Multiscale_sort.h
* Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot
0779373835
extra run of the script to remove tabs and trailing whitespaces
...
right after the merge of 4.14 release branch
+ manual fix on one line in:
* Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
* .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot
590612a563
run the script to remove tabs and trailing whitespaces
2020-03-26 13:25:16 +01:00
Laurent Rineau
e828e60b8d
Merge pull request #4521 from maxGimeno/Installation-Fix_CGAL_WITH_Qt5-maxGimeno
...
Fix CGAL_Qt5_FOUND issue
2020-02-14 14:39:11 +01:00
Maxime Gimeno
8645e59f00
Fix Qt5 COMPONENT installation and don't copy Qt/* at installation step.
2020-02-12 14:24:29 +01:00
Laurent Rineau
97a8128f06
Merge pull request #4271 from maxGimeno/Installation-GMPXX-maxGimeno
...
Set GMPXX ON if detected
2020-02-07 16:25:11 +01:00
Maxime Gimeno
c7c35c24f7
Remove remaining WITH_GMPXX in list
2019-12-16 09:37:52 +01:00
Maxime Gimeno
0783723f47
restore wrongly deleted lines
2019-12-16 09:30:54 +01:00
Maxime Gimeno
64bce3fd90
Remove tehe option WITH_GMPXX completely
2019-12-13 16:31:34 +01:00
Laurent Rineau
8db15111a4
Merge branch 'releases/CGAL-5.0-branch' into Installation-fix_check_of_documented_headers-GF
2019-12-09 15:08:33 +01:00
Laurent Rineau
9149d26492
Fix check headers
...
Before this commit, headers with their own documentation pages, but
not referenced in other documentation pages, were not considered as
documented. This is a fix.
2019-12-09 15:07:10 +01:00
Laurent Rineau
e6510c7b5c
Merge pull request #4285 from lrineau/Installation-fix_CMake_scripts_for_installed_header_only-GF
...
Fix CMake scripts for installed header-only version of CGAL
2019-10-15 16:31:30 +02:00
Laurent Rineau
08a42cf35b
Fix the detection of CGAL_ROOT
...
On Debian, CMake files are in
`/usr/local/lib/x86_64-linux-gnu/cmake/CGAL/` are our previous heuristic fails.
2019-10-11 11:00:29 +02:00
Maxime Gimeno
5dd3c7ee83
Better test
2019-10-03 14:17:39 +02:00
Maxime Gimeno
60d3851a20
Set WITH_GMPXX ON if GMPXX is found in the cmake options of cgal
2019-10-03 13:35:35 +02:00
Laurent Rineau
2a5b7cd7ba
Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
...
Fix CTest on windows
2019-09-05 14:59:38 +02:00
Laurent Rineau
dc93527270
Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
...
Fix CTest on windows
2019-09-05 14:56:25 +02:00
Laurent Rineau
f45c16f815
Add a new custom target ALL_CGAL_TARGETS to track all targets
...
That will include also targets with `EXCLUDE_FROM_ALL`.
2019-09-04 14:18:12 +02:00
Laurent Rineau
5705b9da93
Fix CMake warnings (since 3.15)
2019-08-19 16:18:52 +02:00
Sebastien Loriot
0dd30b1a68
Merge pull request #3900 from lrineau/CGAL-header_only_by_default-GF
...
Make CGAL_HEADER_ONLY the default in CGAL-5.0
2019-07-19 21:14:34 +02:00
Laurent Rineau
4fbf00fb8a
CMake>=3.13: opt for for new policies up to 3.15
2019-06-19 14:34:59 +02:00
Laurent Rineau
6842424fbd
Make CGAL_HEADER_ONLY the default in CGAL-5.0
2019-06-17 15:06:57 +02:00
Laurent Rineau
268cb59ce1
Merge pull request #3739 from lrineau/Installation-remove_FindBLAS_LAPACK_TAUCS-GF
...
Remove support for BLAS, LAPACK, and TAUCS
2019-05-21 16:37:10 +02:00
Laurent Rineau
7bcad36d7e
Merge branch 'master' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF
2019-05-14 16:03:28 +02:00
Sébastien Loriot
1398af1b0b
Merge remote-tracking branch 'cgal/master' into HEAD
2019-04-12 17:44:31 +02:00
albert-github
1dd7473818
Correction of links
...
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Simon Giraudot
d8b51a9672
Merge remote-tracking branch 'laurent/Installation-remove_FindBLAS_LAPACK_TAUCS-GF' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF
2019-04-09 15:22:45 +02:00
Laurent Rineau
68f321c58d
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-04-08 15:58:27 +02:00