songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
101,011 Commits 3 Branches 156 Tags 958 MiB
Commit Graph

461 Commits

Author SHA1 Message Date
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
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