8b153fb495
Merge branch 'cgal/releases/CGAL-5.0-branch'
...
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
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
eb5d1d9a95
Update from master
2020-03-20 08:58:52 +01:00
cc1bd20c7c
Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF
...
Third party libs: improve documentation + introduce new CMake functions
2020-03-17 18:19:40 +01:00
0c8e9cb0c1
Merge pull request #4212 from maxGimeno/Demo-Save_the_scene_entirely-maxGimeno
...
CGAL 3D Demo: Enhancement of the Scene Saving System
2020-03-16 16:35:45 +01:00
32813dc976
Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'
2020-03-16 16:32:47 +01:00
41316e25ef
Protect MSVC specific compilation flags with $<COMPILE_LANGUAGE:CXX>
...
Fix issue #4571
2020-03-11 09:57:46 +01:00
feaa8ce598
Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil
2020-03-05 15:58:17 +01:00
d8fd359399
Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno
2020-02-24 16:41:34 +01:00
00b1f51b24
Move find_package() to function to avoid polluting global cmake variables
2020-02-10 11:57:56 +01:00
6c8fd43ebb
Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization
2020-02-10 11:57:56 +01:00
97a8128f06
Merge pull request #4271 from maxGimeno/Installation-GMPXX-maxGimeno
...
Set GMPXX ON if detected
2020-02-07 16:25:11 +01:00
5daa73c9bc
Use CGAL_target_use_* mechanism for OpenGR and pointmatcher
2020-01-16 16:12:34 +01:00
84cd4ee1fa
Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
...
Add PATHS to find_path 3mf
2020-01-15 17:32:07 +01:00
67b1b0e04f
Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand
...
Surface mesh topology (new package)
2020-01-15 17:24:06 +01:00
c35c608021
Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
...
Add PATHS to find_path 3mf
2020-01-15 17:23:55 +01:00
0019db6076
Fix a bug introduced in CGAL-5.0
...
When CGAL is configured in non-header-only, and then installed, then
CGAL_Qt5 does not work, with a CMake error. Reported in StackOverflow:
https://stackoverflow.com/q/59596301/1728537
2020-01-10 12:34:58 +01:00
8dec83dcf1
Update Installation/cmake/modules/FindOpenMesh.cmake
...
Fix my previous commit.
2020-01-08 09:55:22 +01:00
2be81f7965
Add a name in FindGLPK.cmake
2019-12-30 16:41:01 +01:00
4c36c04fd6
Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno
2019-12-19 11:26:55 +01:00
03ea31e562
Better FindOpenMesh.cmake, compatible with the upcoming OpenMesh 8.1
2019-12-17 16:03:54 +01:00
3ec3e4e9d4
Fix FindOpenMesh.cmake
...
```
CMake Error at C:/CGAL/test/CGAL-5.1-Ic-33/cmake/modules/FindOpenMesh.cmake:54 (set_target_properties):
Property INTERFACE_LINK_LIBRARIES may not contain link-type keyword
"optimized". The INTERFACE_LINK_LIBRARIES property may contain
configuration-sensitive generator-expressions which may be used to specify
per-configuration rules.
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-33/BGL/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Release-64bits.gz
2019-12-17 15:17:07 +01:00
64bce3fd90
Remove tehe option WITH_GMPXX completely
2019-12-13 16:31:34 +01:00
9a50c0f830
Merge branch 'master' into Surface_mesh_topology-gdamiand
2019-11-26 13:22:03 +01:00
bc735b44a0
Check the presence of <CGAL/Qt/*.h> header
...
When CGAL is installed by package-managers, CGAL_Qt5 headers maybe
installed separately:
- `libcgal-qt5-dev` on Debian,
- `CGAL-qt5-devel` on Fedora, for example.
2019-10-31 13:49:22 +01:00
52164b1fba
First pass on removing license notice in header for LGPL files
2019-10-19 15:40:30 +02:00
7356421d80
introduce Commercial license SPDX tag
2019-10-19 12:15:19 +02:00
d0f23b56f6
update deprecated 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-only/"
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-only/"
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-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
2019-10-18 22:08:05 +02:00
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
5ad86b83c6
Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
...
Do not require -DCGAL_HEADER_ONLY
2019-10-16 18:04:33 +02:00
ac1b7ec61a
Fix CGAL_Qt5 in non-header-only
2019-10-16 18:02:26 +02:00
47fcaf3d47
Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
...
Do not require -DCGAL_HEADER_ONLY
2019-10-15 16:34:09 +02:00
e496a5e679
Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF
...
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components
# Conflicts:
# Scripts/scripts/cgal_create_CMakeLists
2019-10-15 16:33:17 +02:00
13bd01d38c
Fix when CGAL_Qt5 is not available
2019-10-15 09:16:26 +02:00
24a099afc6
Fix CGAL_Qt5 in non-header-only
2019-10-14 11:24:13 +02:00
ac557caa4a
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others
2019-10-10 12:23:42 +02:00
60d3851a20
Set WITH_GMPXX ON if GMPXX is found in the cmake options of cgal
2019-10-03 13:35:35 +02:00
030b4cf3a4
Whitelist more headers from Three
...
Without the uic-generated header, they cannot compile.
2019-10-02 11:31:45 +02:00
779ef144fe
Do not require -DCGAL_HEADER_ONLY
...
Now, that macro is set unless `CGAL_NOT_HEADER_ONLY` is 1.
2019-10-01 18:10:30 +02:00
1bce3f7909
Merge branch 'releases/CGAL-4.14-branch'
2019-09-27 16:25:29 +02:00
0b66eb0d23
Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
...
# Conflicts:
# .travis/install.sh
2019-09-27 16:24:41 +02:00
a28d1554b3
FindTBB.cmake: read both TBBROOT and TBB_ROOT ( #4252 )
...
FindTBB.cmake: read both TBBROOT and TBB_ROOT
2019-09-27 16:17:28 +02:00
718421b2b9
Add a line in the Supported Compilers about MSVC and CMake
2019-09-27 15:55:25 +02:00
58b647a1c1
Fix CGAL_TOOLSET for latest visual compilers.
2019-09-27 14:48:53 +02:00
7e36ab1848
FindTBB.cmake: read both TBBROOT and TBB_ROOT
...
Fix #4240
2019-09-26 15:52:20 +02:00
b1a8ec6d76
Add a way to upload a scene through ssh.
2019-09-26 14:57:22 +02:00
df99307140
Merge branch 'releases/CGAL-4.14-branch'
2019-09-09 16:48:23 +02:00
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
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
b8c7cb21bd
Add a hook to track targets without dependent
2019-09-04 14:18:12 +02:00
Sébastien Loriot
Laurent Rineau
Simon Giraudot
Maxime Gimeno
Guillaume Damiand