Commit Graph

74 Commits

Author SHA1 Message Date
Maxime Gimeno 39f97ca56b remove NOT CGAL_HEADER_ONLY 2020-10-05 15:44:05 +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
Maxime Gimeno 8645e59f00 Fix Qt5 COMPONENT installation and don't copy Qt/* at installation step. 2020-02-12 14:24:29 +01:00
Sébastien Loriot 1ef976e3a5 Remove license notice from libQGLviewer forked files 2019-10-19 16:09:56 +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
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0d4c153da2 Fix ImageInterface UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 9c1c0b027a Fix UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 37c52e6bbc WIP SnapShot and SPDX LICENSE update. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0c74a68952 WIP Header_only 2018-05-17 10:20:55 +02:00
Maxime Gimeno cbc0ce1130 remove snapsjot functions and files from qglviewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 50c471253a Move context creation to qglviewer. Replace initializeGL() by init()in demo viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 4c6546a558 Clean-up the viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 39a0b8a8d5 Restore pivot point drawing 2018-05-17 10:20:55 +02:00
Maxime Gimeno 3995c80524 fix warning in camera and fix fps display in cgal_qt5 so we don't have to overwrite it in the viewer
Begin the implementation of the graphcal hints
2018-05-17 10:20:55 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Maxime Gimeno c0c7bd095d WIP: Include QGLViewer inside CGAL_qt5 2018-05-17 10:20:55 +02:00
Andreas Fabri cbf3a16471 libs compile without warning 2018-01-17 15:02:32 +00:00
Laurent Rineau 163a90b6c1 Fix `make install` in header-only
Now the Qt5 resources (qrc files, icons) are installed along with the
CMake modules.
2017-12-07 11:34:00 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau 19c5502ca8 Fix compilation of demos in non-header-only
Now the variables `CGAL_Qt5_MOC_FILES` and `CGAL_Qt5_RESOURCE_FILES` are no
longer used by the definition of `CGAL_Qt5_extras`: other names are used.

`CGAL_Qt5_extras` is not supposed to be used directly by
users/examples/demos' `CMakeLists.txt`.
2017-11-22 12:45:21 +01:00
Andreas Fabri 021b340509 Fix CGAL_Qt5
In non-header-only, the resources and MOC files are added directly to
the CGAL_Qt5 library.
2017-11-22 09:59:52 +00:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Maxime Gimeno 5ae96fc2aa Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found. 2017-05-23 16:12:56 +02:00
Laurent Rineau 2daba815b3 New way to use the CGAL_Qt5 extra files 2017-03-27 17:23:27 +02:00
Laurent Rineau 429bfa4315 move the add_config_flag calls 2017-03-27 17:23:26 +02:00
Laurent Rineau 70e5a280f0 INSTALL use COMPONENT 2017-03-27 17:23:26 +02:00
Laurent Rineau ff15d0e5fc Simplify the CMakeLists.txt of our libraries 2017-03-27 17:23:26 +02:00
Laurent Rineau 1cde972cdb Remove whitespace at end of lines 2016-06-29 11:04:29 +02:00
Laurent Rineau 2a59492fa9 Fix a bug also present in master 2016-06-29 11:04:09 +02:00
Guillaume Damiand 71d9047b87 Move add_definition before collect cgal library (bugfix) 2016-06-28 12:46:22 +02:00
Guillaume Damiand 6820e1b5c4 Reorder the cmake directive to retreive the same original order 2016-06-28 11:30:18 +02:00
Guillaume Damiand 061ffa6806 Remove a double QUIET 2016-06-24 18:57:23 +02:00
Guillaume Damiand f446cb9370 Remove some command unseless in header only 2016-06-24 14:37:38 +02:00
Guillaume Damiand e115fc07a1 Use install(DIRECTORY instead of file(glob following by install(files 2016-06-21 19:05:38 +02:00
Guillaume Damiand 1f40288aa3 Update cmakes in order to deal with install version of CGAL in header only mode. 2016-06-21 11:20:28 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Laurent Rineau a96ec65c54 Sort results of file(GLOB ...) to make build deterministic
Patch from Joachim Reichel <reichel@debian.org>, adapted from the flat
layout to the Git layout.

Fix #1048.
2016-05-06 16:50:16 +02:00
Laurent Rineau 0ffa350ad7 Header-only big bluff!
One can set dependencies even without searching for them.
2016-03-09 18:53:59 +01:00
Laurent Rineau fd42bc1d15 Step 2
CGAL_ImageIO and CGAL_Qt5 are not even configured in header-only
mode. They will be configured later by `CGALConfig.cmake`.
2016-03-09 17:14:04 +01:00
Guillaume Damiand c623442071 Bug fix in CGAL_Qt5/CMakeLists.txt 2016-03-09 14:25:03 +01:00
Clement Jamin dd3ed5b07c Remove the "S" from HEADERS_ONLY 2016-03-09 10:58:55 +01:00
Clement Jamin 35a11c0e13 Use CGAL_HEADERS_ONLY everywhere 2016-03-09 10:56:11 +01:00
Clement Jamin c27ff9e85c Rename some cmake variables 2016-03-09 10:42:46 +01:00
Guillaume Damiand 78cde742ce Work on demo with qt5; ok for AABBtree (but need to be improved) 2016-03-09 10:35:22 +01:00