Commit Graph

110 Commits

Author SHA1 Message Date
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Sébastien Loriot 1398af1b0b Merge remote-tracking branch 'cgal/master' into HEAD 2019-04-12 17:44:31 +02:00
Laurent Rineau 138e1b4d64 Fix the link error on Windows (non header-only) 2019-04-04 13:39:18 +02:00
Maxime Gimeno ecff35a7e9 Replace the CMP0054 spec by the right cmake_required_version 2019-04-03 13:14:40 +02:00
Maxime Gimeno 22caa66feb Fix CMP0054 warning in hyperbolic triangulation demos 2019-04-03 11:07:13 +02:00
Maxime Gimeno 57692b2ddc Rename executable from demos so it is tested in the testsuite. 2019-04-02 15:18:04 +02:00
Laurent Rineau a576aed133
Merge branch 'master' into CGAL-Exact_algebraic-GF 2019-03-27 10:20:53 +01:00
Laurent Rineau d4e09c1d78 Modernize the CMakeLists.txt that use LEDA
The file `${CGAL_USE_FILE}` must be included before
`find_package(LEDA)` can be called. But that would require to verify
`CGAL_FOUND` first...

Actually, now that we require at least CMake 3.1, let's say that CGAL
is `REQUIRED`, but not the components. That is the basic truth, and
that avoids testing for `CGAL_FOUND`.

At the same time, I have modified the `cmake_minimum_required`:
  - placed as the first line,
  - set to `3.1...3.13`:
      https://cmake.org/cmake/help/latest/command/cmake_policy.html#setting-policies-by-cmake-version

I have also removed the comments that says the `CMakeLists.txt` was
generated. That may have been true... but before a lot of modifications.
2019-03-27 09:56:16 +01:00
Andreas Fabri 0c0d5e1cfb Fix my fix 2019-03-26 18:11:38 +01:00
Andreas Fabri 9061510d86 Fix Periodic_4_hyperbolic_triangulation_2 2019-03-26 17:44:22 +01:00
Maxime Gimeno e2becb4e54 Fix warning for CMP0071 2019-03-25 10:24:33 +01:00
Laurent Rineau 20772a9a44 Fix the notice 2019-03-07 10:22:00 +01:00
Laurent Rineau 2a5ebb2089 Fix the use of resources
The key issue was that the `CMakeLists.txt` was not using
`CGAL_Qt5_RESOURCE_FILES`, and instead the author decided to copy the
resources and qrc files.
2019-03-07 09:22:11 +01:00
Iordan Iordanov b9564449ed Fixed 'About' for demo of HT2 2019-02-07 20:02:21 +01:00
Laurent Rineau f37ac9cfc6 Fix non-header-only CGALConfig.cmake as regards to CGAL_Core
... and then fix the `CMakeLists.txt` of HDT2_demo.
2019-02-04 15:09:07 +01:00
Laurent Rineau 7e83c9ddf6 Copy the resources from GraphicsView/demo/icons/
That is:
  - a dirty hack,
  - a fixup of commit 65e115c5230, that started copy the qrc files
    without copying the resources.
2019-02-04 15:07:38 +01:00
Maxime Gimeno 7932cf1372 Remove the required in find_package boost 2019-02-01 11:22:03 +01:00
Maxime Gimeno 121526fc21 Add Boost thread to HDT2 demo. 2019-01-31 09:34:00 +01:00
Maxime Gimeno 0cbb165b9f Add missing files 2019-01-30 10:15:31 +01:00
Maxime Gimeno 5a236a5bf8 Add a test for Boost_FOUND and reduce hyperbolic_delaunay_triangulation_2_demo to HDT2 for paths 2019-01-25 09:49:13 +01:00
Maxime Gimeno 8cbede3b0b Add link to CGAL_Core 2019-01-24 09:03:59 +01:00
Maxime Gimeno c143c657eb Fix permisisons 2019-01-23 16:45:55 +01:00
Maxime Gimeno d40fb37b45 Link with CGAL and Qt5 and add NOTICE if no Qt5. 2019-01-23 10:44:39 +01:00
Maxime Gimeno c418829a5d Fix errors on MSVC for H2t2 demo 2019-01-22 10:06:32 +01:00
Maxime Gimeno d657fe0e1e Add a test for Qt5 in the demos. 2019-01-21 10:27:56 +01:00
Maxime Gimeno 732bfb756d Fix CMakelists for demo. 2019-01-18 10:14:28 +01:00
Iordan Iordanov 1c7f056c27 Added resource files and edited CMakeFiles.txt for demo to please testsuite 2019-01-09 20:41:49 +01:00
Iordan Iordanov c6b8dfdb30 fix for demo cmake file to make Travis happy 2019-01-08 10:31:56 +01:00
Iordan Iordanov 650fbdd131 Modifications to demo to use new point functions 2018-12-30 17:47:55 +01:00
Iordan Iordanov bacf3055ef Modified demo title 2018-12-30 17:11:41 +01:00
Iordan Iordanov 89a8ee1003 Fixes for CMake files include directive 2018-12-27 08:01:41 +01:00
Mael Rouxel-Labbé 663bf96c05 Fixed project names for HT2/P4HT2 2018-12-19 22:54:48 +01:00
Mael Rouxel-Labbé 322ddd50c8 Fixed headers / licenses in HT2 / P4_HT2 2018-12-19 20:31:49 +01:00
Mael Rouxel-Labbé 33908ab7a2 Code improvements in HT_2
- Fixed missing consts
- Fixed warnings
- Rewrote the most common traits class (others to do)
- Various tiny improvements
- ...
2018-12-19 16:08:27 +01:00
Iordan Iordanov 964775d43e changes to demo for better images 2018-12-12 18:05:11 +01:00
Iordan Iordanov 54353573e5 small change to demo 2018-12-12 15:02:55 +01:00
Iordan Iordanov e6fc0250de modifications to demo to account for changes in triangulation class 2018-09-03 13:51:50 +02:00
Iordan Iordanov 1641e32ed0 renamed segment() and triangle() to hyperbolic_segment() and hyperbolic_triangle(); note that DT_2 still needs triangle() and segment(), so these members are left undocumented; changes to demo to account for renames 2018-08-23 22:55:50 +02:00
Iordan Iordanov 731d95aee8 renamed circulators and iterators from Finite_ and Hyperbolic_ to All_; changes to demo to account for renames 2018-08-23 22:55:50 +02:00
Iordan Iordanov 8fe498884f renamed function get_conflicts() to find_conflicts() 2018-08-23 22:55:50 +02:00
Iordan Iordanov d9dd3d54e5 bugfix for demo compilation on Linux 2018-08-08 21:19:14 +02:00
Iordan Iordanov 08c11a06aa bugfix (conflicting Locate_type decarations) 2018-06-11 18:02:14 +02:00
Iordan Iordanov 5bbc247aa9 modified demo to reflect hierarchy; removed a few functionalities that were wrong (moving point was using point removal; it was not correct) 2018-05-09 11:11:02 +02:00
Iordan Iordanov 1921a928ca The traits with CORE now use the same constructions as the traits with CK 2018-03-08 17:27:53 +01:00
Iordan Iordanov 5bf97da410 CK traits now uses Weighted_point_2 from Kernel; class cleanup (removed commented items and output messaged) 2018-03-01 11:38:08 +01:00
Iordan Iordanov 89fe908cdc fixed conflict in cmakelists.txt 2018-03-01 11:12:52 +01:00
Iordan Iordanov f620928aaf renamed Simple_circular_arc_2 to Circular_arc_2 in the traits with kernel; removed costly assertions from constructions 2018-03-01 11:07:28 +01:00
Iordan Iordanov 6483516c5c cleanup of Hyperbolic_triangulation_2 -- unnecessary files migrated to INRIA/Periodic_2g_hyperbolic_triangulation_2-IIordanov 2018-03-01 11:07:28 +01:00
Iordan Iordanov 6aff91506e added kernel with template; demos work with both kernels now (see precompiler parameter) 2018-03-01 10:52:06 +01:00
Iordan Iordanov 3440d43796 renamed Misha's traits in view of upcoming modifications 2018-03-01 10:52:06 +01:00