Commit Graph

338 Commits

Author SHA1 Message Date
Laurent Rineau 38e7c641d7 Merge pull request #4780 from maxGimeno/GraphicsView-Fix_qt_deprecated_code-maxGimeno
GraphicsView: Fix Qt 5.15 deprecation warnings
2020-06-23 18:50:07 +02:00
Maxime Gimeno 722fa93927 More fixes 2020-06-15 16:05:49 +02:00
Maxime Gimeno 857dcaceb9 Add missing find_package(Qt5) for Hyperbolic_triangulation_2 demo 2020-06-12 09:38:27 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02: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 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot b13e116919 Manual removal of license notice + fix SPDX flags 2019-10-19 17:00:08 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Laurent Rineau 67c3e26859 Merge branch 'releases/CGAL-4.14-branch' 2019-09-10 09:19:06 +02:00
Maxime Gimeno 2f483bb023 Add misisng include_directories to HDT2 demo 2019-09-10 09:05:16 +02:00
Laurent Rineau df99307140 Merge branch 'releases/CGAL-4.14-branch' 2019-09-09 16:48:23 +02:00
Laurent Rineau 9abee11ee8 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-09 16:43:29 +02:00
Laurent Rineau 94d654b9ab Fill CGAL_EXECUTABLE_TARGETS wherever that was missing 2019-09-04 14:19:54 +02:00
Maxime Gimeno 92c9250855 Add some caching in new demos 2019-08-16 12:26:24 +02:00
Maxime Gimeno 3513016dcf Updates for ctest with visual generator 2019-08-16 12:22:11 +02:00
Sébastien Loriot 2e747dd300 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD 2019-07-18 17:01:42 +02:00
Maxime Gimeno d21709d0bd More ->matrix() replaced 2019-07-10 11:58:13 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +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
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Sébastien Loriot 1398af1b0b Merge remote-tracking branch 'cgal/master' into HEAD 2019-04-12 17:44:31 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +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
Andreas Fabri 13010e9f13 Fix hyperbolic triangulation example 2019-04-03 11:51:30 +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
Maxime Gimeno 9e71d9fc23 Merge pull request #3744 from afabri/CGAL_backtick_GF
Periodic and Hyperbolic triangulations: backtick
2019-03-12 17:04:12 +01:00
Andreas Fabri a0be3b44af Periodic and Hyperbolic triangulations: backtick 2019-03-08 09:57:57 +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
albert-github ff3a5174bd CSS properties and values separated by semicolons
CSS properties and values should be separated by semicolons but here the width property was followed by an equal sign.
2019-02-27 18:32:40 +01:00
Sébastien Loriot fe5c2d0bb8 use macros 2019-02-23 11:57:29 +01:00
Iordan Iordanov 7eb7e44b1a added test with degenerate cases for HT2 2019-02-13 23:36:19 +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