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
f45c16f815
Add a new custom target ALL_CGAL_TARGETS to track all targets
...
That will include also targets with `EXCLUDE_FROM_ALL`.
2019-09-04 14:18:12 +02:00
ba9adf4aa9
Fix typo
2019-08-16 13:08:00 +02:00
3513016dcf
Updates for ctest with visual generator
2019-08-16 12:22:11 +02:00
a0ea4f0c5f
Merge branch 'releases/CGAL-4.14-branch'
2019-07-31 17:01:03 +02:00
69e5072cc1
Get rid of the two fake lines in ctest_testsuite
2019-07-29 13:35:19 +02:00
7b1889b87e
Merge branch 'releases/CGAL-4.14-branch'
...
# Conflicts:
# Point_set_processing_3/include/CGAL/IO/write_ply_points.h
2019-07-26 18:45:17 +02:00
da2726e0e7
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
...
# Conflicts:
# CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h
# Installation/lib/cmake/CGAL/CGALConfig.cmake
# Intersections_2/test/Intersections_2/test_intersections_2.cpp
# Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h
# Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h
2019-07-26 18:33:55 +02:00
4d5b4c950a
Merge pull request #4085 from maxGimeno/Update_Find_TBB-GF
...
Update FindTBB.cmake
2019-07-26 18:27:00 +02:00
fbf163d244
Fix when CGAL_USE_FILE is not included
2019-07-25 16:13:08 +02:00
a17c0d628d
Fix our usage of TBB and <thread.h>
...
A lot of parts of CGAL use `<thread>` in conjunction with TBB. I have
added the `find_package(Threads)` in `CGAL_target_use_TBB.cmake` for
convenience.
I have also restored FindTBB.cmake as a pure copy of
https://github.com/Kitware/VTK/blob/master/CMake/FindTBB.cmake
with that version:
> c7249fed2e73ce25fbbc53363d9caf4ab5cc9195
> Author: Cory Quammen <cory.quammen@kitware.com>
> Date: Thu Feb 14 23:21:09 2019 -0500
>
> FindTBB: handle basic linker scripts
>
> TBB binaries may define libtbb.so as a linker script of the form
>
> INPUT(libtbb.so.2)
>
> Make FindTBB find the real .so file libtbb.so points to in such cases.
>
> Approach borrowed from vtk-m/CMake/VTKmDeviceAdapters.cmake on
> suggestion from Robert Maynard.
>
>
2019-07-24 10:35:36 +02:00
82567685ad
Add include of CGAL_taret_use_TBB in the end of the new FindTBB
2019-07-19 09:34:12 +02:00
724e70b97f
Merge pull request #3984 from LiangliangNan/master
...
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
2019-07-18 17:05:25 +02:00
7f604308d0
Update FindTBB.cmake
2019-07-15 12:45:28 +02:00
7cd85f845b
Merge branch 'master' into Surface_mesh_topology-gdamiand
2019-07-10 15:32:21 +02:00
d3b9d89596
Merge pull request #4013 from lrineau/CGAL_Core-no_need_for_Boost.Thread-GF
...
Remove the need for Boost.Thread (but for CGAL_Core and gcc<9.1)
2019-07-10 14:22:53 +02:00
dc02598a5c
Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
...
CGAL: more viewers
2019-07-10 14:22:50 +02:00
dee111bec5
Improve FindOpenMesh by adding an imported target
2019-07-05 10:35:56 +02:00
c0ba28f80a
Merge branch 'releases/CGAL-4.14-branch'
2019-07-03 11:18:20 +02:00
e79bfd5d03
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-07-03 11:10:03 +02:00
5341998c7e
Add a new ctest fixture, that checks the build system
...
That will avoid that `cmake` is run in parallel several times, when
`ctest -j` is used.
2019-06-28 12:53:53 +02:00
2ce7800239
Unfortunately gcc < 9.1 has bug with thread_local that impact CGAL
2019-06-24 14:27:20 +02:00
1bcaf6bbf3
Fix in non-header-only: one has to call find_package(Boost)
2019-06-20 11:57:37 +02:00
67307dcead
Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments.
2019-06-19 15:48:10 +02:00
010f05dfeb
find GLPK
...
- added FindGLPK.cmake
- try to find SCIP first. If not, try to find GLPK
2019-06-19 15:02:27 +02:00
e260ea1dd4
C++11: remove the need for Boost.Thread, even with CGAL_Core
2019-06-18 15:06:23 +02:00
92add3db18
Update list_of_whitelisted_headers.cmake
...
added
CGAL/SCIP_mixed_integer_program_traits.h
and
CGAL/GLPK_mixed_integer_program_traits.h
2019-06-12 21:21:55 +02:00
419032d859
Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
...
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
5dc823d509
Merge branch 'releases/CGAL-4.14-branch'
2019-05-23 08:49:56 +02:00
7be5e3fbe5
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-05-23 08:44:39 +02:00
357fe1e486
Fix CTest CGAL tests when binary dir is a sub-directory
...
When the current binary dir is a sub-directory of the current sources
dir, then the recursive copy of the sources dir to `__exec_test_dir/`
cannot be done. In that case, do not setup the fixture
directory. Tests can still be run in the source directory (and pollute
it).
2019-05-20 12:18:18 +02:00
2848158354
Fix typos
2019-05-20 08:54:04 +02:00
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
8e872081fc
Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
...
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
# Conflicts:
# .travis/build_package.sh
# Installation/cmake/modules/CGALConfig_binary.cmake.in
# Installation/cmake/modules/CGALConfig_install.cmake.in
# Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
# Installation/lib/cmake/CGAL/CGALConfig.cmake
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
# Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
7bcad36d7e
Merge branch 'master' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF
2019-05-14 16:03:28 +02:00
870ff45168
Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
...
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
aebb058b58
Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
...
Adapt to Boost 1.70
2019-05-07 15:45:00 +02:00
43cc6b2b2d
CGAL_TweakFindBoost must be included before any call to FindBoost
2019-05-06 16:40:50 +02:00
91d7fd4cb2
CGAL_TweakFindBoost must be included first
2019-05-06 16:34:07 +02:00
212a088c5e
That variable CGAL_TweakFindBoost was useless if not set
2019-05-06 16:33:42 +02:00
d8e23fefd2
CGAL requires CMake 3.1, that know about Boost 1.56 or before
2019-05-06 16:33:01 +02:00
623fd4f10f
If BUILD_SHARED_LIBS is not defined, use Boost shared libs
2019-05-03 18:39:30 +02:00
7812d1b810
Boost: link with imported targets, if they exist
2019-04-29 16:36:04 +02:00
3cb372be34
Do not search for Boost thread when not needed
2019-04-29 15:24:51 +02:00
af52b353d2
Boost 1.70 uses the CMake Config mode, now
2019-04-26 17:12:54 +02:00
a9fd0a3729
Bug-fix: Boost Thread is a dependency of CGAL_Core only for GNU/g++
...
Previously, it was documented to g++ only, but the code was just
checking "not MSVC", and thus clang was in the set.
2019-04-26 17:12:01 +02:00
6615d1d12d
Change the default value of CGAL_Boost_USE_STATIC_LIBS
...
It is now related to `BUILD_SHARED_LIBS`.
2019-04-26 17:11:24 +02:00
36dba385a0
Add a bunch of new Boost versions
2019-04-26 17:10:49 +02:00
f3bc713103
Typo in a comment
2019-04-26 17:10:35 +02:00
d8b51a9672
Merge remote-tracking branch 'laurent/Installation-remove_FindBLAS_LAPACK_TAUCS-GF' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF
2019-04-09 15:22:45 +02:00
04bef2b071
Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
...
Update for cpp14
2019-04-08 15:59:28 +02:00
68f321c58d
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-04-08 15:58:27 +02:00
b86532d357
Merge pull request #3830 from lrineau/Installation-fix_Windows_DLL_verinfo-lrineau
...
Fix CGAL DLLs verinfo on Windows
2019-04-08 15:57:31 +02:00
d07a2c9184
Remove (GMP|MPFR)_IN_CGAL_AUXILIARY
...
There was a bug in `FindGMP.cmake` and `FindMPFR.cmake`: they were
using the undefined macro `cache_set`.
I have removed those variables definitions, and wrote the code
differently where they were used.
2019-04-04 15:25:01 +02:00
85047bcb61
Sneak a new feature in this branch: detect unused .cpp files
...
For the moment, the feature is far from being ready:
- in case of header-only, the .cpp sources files of CGAL libraries are
reported,
- when a dependency for a test/examples is missing, the corresponding
.cpp files is reported,
- and I have no clue which CMake version is required.
But I found real issues.
By default, the feature is OFF. It will only be activated if the CMake
variable or cache variable `CGAL_CHECK_UNUSED_CPP_FILES` is true. We
might activate it on a per-directory basis... or have it by default,
and deactivate it per-directory. We'll see. For the moment, let's keep
it deactivated.
2019-04-03 14:11:50 +02:00
8539c09179
CGAL requires C++14.
2019-04-01 18:35:58 +02:00
84b9328619
Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch
2019-03-29 15:49:12 +01:00
8c4032262f
Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
...
Fix the order of link when GMP is a static lib
2019-03-28 16:49:51 +01:00
4b7cc4a896
Fix the order of link of GMPXX when GMP is a static library.
2019-03-28 09:04:03 +01:00
c988d7d1af
Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
...
Fix the order of link when GMP is a static lib
2019-03-27 18:04:59 +01:00
310ce89b91
Fix the order of link when GMP is a static lib
2019-03-27 17:51:24 +01:00
ea145c71fe
Merge pull request #3759 from maxGimeno/Cross_compilation-Update_scripts-GF
...
Testsuite : Use ctest
2019-03-26 17:01:56 +01:00
bc6954af01
Fix an error in Fedora RPM
...
```
CGAL-devel.x86_64: E: zero-length /usr/lib64/cmake/CGAL/config/support/test_syntaxonly.cpp
```
https://taskotron.fedoraproject.org/artifacts/all/bf72d02c-4aff-11e9-a48a-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log
2019-03-26 10:49:00 +01:00
43167252fa
Fix cin management in CGAL_add_tests
2019-03-21 11:37:39 +01:00
6eab4c014c
Update the handle of .cin files with CGAL_RUN_TESTS_THROUGH_SSH
2019-03-21 09:52:53 +01:00
1a6ef33010
WIP from git and upload to private page
2019-03-14 16:36:11 +01:00
64cfc19d68
Remove -d option. Any HOST declared as not localhost will be considered as a remote host and launch the cross compilation.
2019-03-12 14:58:11 +01:00
7c0d23b18f
Fix CGAL_DIR and change names in CGAL_add_tests
2019-03-12 10:13:07 +01:00
ca67ac5c1f
Remove all mentions of BLAS, LAPACK, and TAUCS in our CMake scripts
2019-03-07 09:40:08 +01:00
aa76cd02b6
Use a single script for testsuite with or without docker
2019-03-06 14:17:48 +01:00
17079b0d53
Kill remote process if ssh is killed (ctrl+c or timeout)
2019-03-01 15:43:58 +01:00
902070d4d1
Add a label for push__oh_
2019-02-28 16:32:01 +01:00
7407a432ce
Merge branch 'master' of https://github.com/CGAL/cgal into Cross_compilation-Update_scripts-GF
2019-02-28 11:59:04 +01:00
5199eb70ee
Merge pull request #3283 from imiordanov/Periodic_4_hyperbolic_triangulation_2-IIordanov
...
New packages: Hyperbolic_triangulation_2 / Periodic_4_hyperbolic_triangulation_2
2019-02-22 16:39:12 +01:00
42f3928de3
Fix CGAL_DISABLE_GMP
2019-02-22 16:00:53 +01:00
7cf4a1fff8
Merge pull request #3501 from lrineau/CGAL-fix_with_LEDA_without_CGAL_Core-GF
...
Partially fix the testsuite with LEDA instead of GMP
2019-02-22 10:04:22 +00:00
5376673151
Fix the testsuite of Arrangement_on_surface_2
2019-02-21 17:00:53 +01:00
13e7f7633c
Fix push__of_ in arrangement
2019-02-21 16:56:34 +01:00
2ddee24f1a
Fix the dependencies
2019-02-21 16:09:42 +01:00
1e17519384
Fixes
...
- The dependencies of push_of__ tests were not correct.
- Fix the handling of tests with .cin, when ssh/scp are used.
2019-02-21 15:49:48 +01:00
c01eddb62a
Remove unused LD_LIBRARY_PATH
2019-02-21 15:47:12 +01:00
a52f7198d2
WIP SSH
2019-02-20 16:46:28 +01:00
fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
...
Fix warnings (Add/remove copy constructors, and other warnings)
Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
ca4f5e12ed
Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov
2019-02-12 15:58:49 +01:00
9b71af64c8
Add -Wno-cast-function-type to fix a warning in Qt5
...
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.14-Ic-117/Polyhedron_Demo/TestReport_lrineau_Ubuntu-latest-GCC6-CXX1z.gz
```
/usr/local/bin/c++ -DCGAL_EIGEN3_ENABLED -DCGAL_TEST_SUITE=1 -DCGAL_USE_GMP -DCGAL_USE_MPFR -DCGAL_USE_ZLIB=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NO_KEYWORDS -DQT_OPENGL_LIB -DQT_SCRIPT_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -DSCENE_IMAGE_GL_BUFFERS_AVAILABLE -DUSE_FORWARD_DECL -Dpolyhedron_demo_EXPORTS -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/polyhedron_demo_autogen/include -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/./CGAL_demo -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/./include -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/. -isystem /usr/include/x86_64-linux-gnu -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/include -I/mnt/testsuite/include -isystem /usr/include/eigen3 -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtOpenGL -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt5/QtSvg -I/usr/include/x86_64-linux-gnu/qt5/QtXml -I/usr/include/x86_64-linux-gnu/qt5/QtScript -DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z -frounding-math -fPIC -Wno-deprecated-copy -Wall -frounding-math -fPIC -std=gnu++11 -o CMakeFiles/polyhedron_demo.dir/MainWindow.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp
In file included from /usr/include/x86_64-linux-gnu/qt5/QtScript/QScriptEngine:1,
from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.h:10,
from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp:4:
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h: In instantiation of 'int qScriptRegisterMetaType(QScriptEngine*, QScriptValue (*)(QScriptEngine*, const T&), void (*)(const QScriptValue&, T&), const QScriptValue&, T*) [with T = CGAL::Three::Scene_item*]':
/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp:313:67: required from here
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h:390:18: warning: cast between incompatible function types from 'QScriptValue (*)(QScriptEngine*, CGAL::Three::Scene_item* const&)' to 'QScriptEngine::MarshalFunction' {aka 'QScriptValue (*)(QScriptEngine*, const void*)'} [-Wcast-function-type]
390 | eng, id, reinterpret_cast<QScriptEngine::MarshalFunction>(toScriptValue),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h:391:9: warning: cast between incompatible function types from 'void (*)(const QScriptValue&, CGAL::Three::Scene_item*&)' to 'QScriptEngine::DemarshalFunction' {aka 'void (*)(const QScriptValue&, void*)'} [-Wcast-function-type]
391 | reinterpret_cast<QScriptEngine::DemarshalFunction>(fromScriptValue),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
2019-02-07 17:49:14 +01:00
1a45e1c753
Merge pull request #3535 from sgiraudot/Classification-Neural_network_and_parallelized_random_forest-GF
...
[Small Feature] Classification: Neural Network and parallelized Random Forest
2019-02-07 13:31:20 +01:00
0ca486665a
Merge pull request #3654 from maxGimeno/Triangulation_fix_tests_for_clang-GF
...
Triangulation: Fix the tests for GCC<4.4 so it wont match clang.
2019-02-07 13:30:46 +01:00
27f1dc4a62
Do no always search for GMPXX
...
There is a kind of bug in `UseCGAL.cmake`, that enables GMPXX if it is
found, even if `WITH_GMPXX` is `OFF`. If GMPXX is never search for,
that should avoid it to be accidentally activated on platforms we do
not want it.
2019-02-07 10:12:51 +01:00
2455affba0
Move the addition of -Wno-deprecated-copy to CGAL_Qt5 setup
...
That way:
- that will work, even if CGAL CXX_FLAGS are copied (when hte CMake
options `CGAL_DEV_MODE` or `RUNNING_CGAL_AUTO_TEST` are `ON`),
- that will affect all CGAL Qt5 demos at once.
2019-02-06 11:47:44 +01:00
02690350ee
Replace include(CTest) by minimal usage
...
- Define the option `BUILD_TESTING`
- Call to `enable_testing()` if `BUILD_TESTING` is on.
2019-02-04 15:30:24 +01:00
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
de8dde79f4
Replace not by ! in preprocessor directives
2019-02-04 10:40:00 +01:00
0c1517d97e
Merge pull request #3446 from sloriot/Installation-extra_slash
...
Clean-up include dir in CGALconfig.cmake
2019-01-22 09:15:24 +01:00
a8c6505642
Merge pull request #3446 from sloriot/Installation-extra_slash
...
Clean-up include dir in CGALconfig.cmake
2019-01-22 09:13:23 +01:00
dc9d52f485
Update filename in whitelisted headers
2019-01-10 11:08:56 +01:00
3cc1b995be
Merge remote-tracking branch 'mine/Classification-Neural_network_and_parallelized_random_forest-GF' into Classification-Neural_network_and_parallelized_random_forest-GF
2018-12-21 10:31:00 +01:00
847a6d8a8f
Add TensorFlow_neural_network_classifier to whitelisted headers
2018-12-14 10:22:11 +01:00
c14fda590d
Merge branch 'master' into CGAL-Fix_CTest-GF
2018-12-10 16:52:33 +01:00
a328ce9470
Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch
2018-12-10 15:07:12 +01:00
950fd19be6
Merge pull request #3482 from lrineau/Installation-LEDA_remove_ffriend_injection-GF
...
Try to use LEDA without -ffriend-injection
2018-12-10 14:38:23 +01:00
f520f9eb11
First version of NN with TensorFlow
2018-12-06 14:59:57 +01:00
a9ef1dd0a5
Really test with LEDA!!
2018-11-30 16:56:08 +01:00
263a5715f2
Try to use LEDA without -ffriend-injection
2018-11-26 16:34:12 +01:00
c28c0a4b2d
Fix a bug with CTest in non-header-only
...
The pull-request https://github.com/CGAL/cgal/pull/3413 has introduced
a side-effect: CTest was broken when `CGAL_HEADER_ONLY=OFF`, for all
tests using a `.cin` or `.cmd` file. That is due to the variable
`CGAL_CURRENT_SOURCE_DIR` that was only filled by `UseCGAL.cmake`.
Now that we forbid CGAL directories without `CMakeLists.txt`, that
variable `CGAL_CURRENT_SOURCE_DIR` is now useless, and can be removed:
`CMAKE_CURRENT_SOURCE_DIR` is sufficient. That fixes the bug with
CTest, and also makes the CMake code a bit simpler.
2018-11-19 14:33:54 +01:00
66f2d5404e
remove extra /
2018-11-08 17:12:12 +01:00
0c3878694b
Include CGAL_Common.cmake, where variable EIGEN3_USE_FILE is defined.
2018-11-06 11:03:59 +01:00
9e9df2c196
Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD
2018-11-02 10:55:57 +01:00
50108dc627
Fix wrong policy setting
2018-10-29 14:25:47 +01:00
f8a37e59ef
Fix issue #3317 by removing the unused module FindGLEW.cmake
2018-09-17 14:41:54 +02:00
ddd7f8fa3b
Add an option to disable viewer when running ctest.
2018-09-07 13:29:38 +02:00
919b9afe92
Merge pull request #3229 from lrineau/Installation-fix_compatibility_with_CMake_3.13-GF
...
Set CMP0077 to OLD (new in CMake-3.13)
2018-07-16 11:12:56 +02:00
6079b3847e
Set CMP0077 to OLD (new in CMake-3.13)
2018-07-13 11:24:50 +02:00
ab973c90e0
Merge pull request #2739 from lrineau/Mesh_3-improve_polylines_to_protect-GF
...
Mesh_3 new improvements: polylines_to_protect(), new API of Labeled_mesh_domain_3
2018-06-01 17:25:52 +02:00
fbe5ee39c7
Update cmake files
2018-05-28 17:18:59 +02:00
2766e1ff5d
Merge 'master' and fix conflicts
2018-05-28 16:40:09 +02:00
265a81bf76
Merge pull request #2967 from maxGimeno/CGAL-With_QGLViewer-GF
...
CGAL_Qt5: include QGLViewer
2018-05-28 13:58:10 +02:00
39c913a090
CERR: create the file before using it
2018-05-24 14:44:48 +02:00
4ba33e17d3
Run the compiler a second time without -H in case of errors
2018-05-23 15:09:53 +02:00
95edcb3778
Fix compilation error in header-only
2018-05-17 10:20:56 +02:00
0d4c153da2
Fix ImageInterface UI management
2018-05-17 10:20:56 +02:00
9c1c0b027a
Fix UI management
2018-05-17 10:20:56 +02:00
37c52e6bbc
WIP SnapShot and SPDX LICENSE update.
2018-05-17 10:20:56 +02:00
0c74a68952
WIP Header_only
2018-05-17 10:20:55 +02:00
c0c7bd095d
WIP: Include QGLViewer inside CGAL_qt5
2018-05-17 10:20:55 +02:00
d03f76cd78
Remove that annoying warning
...
When a user-project is compile from a Git repository, there was that
annoying warning about the project not being developed in the same branch
as CGAL itself!
2018-05-15 14:56:22 +02:00
c180c0678d
Fix LEDA support with gcc
2018-04-26 14:59:24 +02:00
ee61c2752c
Fix CMake scripts when GMP or MPFR is found under auxiliary/
2018-04-16 18:21:08 +02:00
17032feff4
Set the CGAL version variables in header-only
...
Fixes #2820 .
2018-04-13 14:58:56 +02:00
bd14587987
Fix GMPXX
2018-04-04 10:56:53 +02:00
7bb25993d6
GMPXX: Add CGAL_USE_GMPXX in header-only
2018-04-03 17:31:52 +02:00
1384d24b99
add GMPXX support (work in progress)
2018-04-03 17:22:45 +02:00
b262232f49
Remove the warnings from the testsuite
...
In the testsuite, with `RUNNING_CGAL_AUTO_TEST`, the message will end with:
> Set CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE to TRUE if you want to
> disable this notice.
instead of
> disable this warning.
Because otherwise our test results are full of yellow 'w' (warnings).
2018-03-22 13:11:29 +01:00
1d0663da1d
Remove one misleading sentence
2018-03-20 17:53:50 +01:00
671933072c
Guard the inclusion
2018-03-20 17:09:57 +01:00
f3b4302a08
Document the hook
2018-03-20 17:08:52 +01:00
2d1cb94f5b
Only monitor the accesses of type MODIFIED_ACCESS
2018-03-20 17:08:52 +01:00
30df6e803a
CGAL_DEV_MODE: Release is now the default CMAKE_BUILD_TYPE
...
Even for a CGAL developer, Release is what we want, unless we really want
to open a debugger.
2018-03-20 17:08:52 +01:00
66b4ec4214
Add a warning about the use of Debug or "" in CMAKE_BUILD_TYPE
2018-03-20 17:08:52 +01:00
471e7a93be
Deal with Qt5 and Boost imported targets, when CGAL is imported
...
When CGAL_Qt5 or CGAL_Core targets are imported, then we need to call
`find_package(Qt5)` and `find_package(Boost)` to re-import the
targets of Qt5 or `Boost::thread`.
Otherwise, there is that CMake warning:
CMake Warning (dev) at /mnt/testsuite/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake:49 (add_executable):
Policy CMP0028 is not set: Double colon in target name means ALIAS or
IMPORTED target. Run "cmake --help-policy CMP0028" for policy details.
Use the cmake_policy command to set the policy and suppress this warning.
Target "test_Min_circle" links to target "Boost::thread" but the target was
not found. Perhaps a find_package() call is missing for an IMPORTED
target, or an ALIAS target is missing?
Call Stack (most recent call first):
CMakeLists.txt:22 (create_single_source_cgal_program)
This warning is for project developers. Use -Wno-dev to suppress it.
and then that link error:
/usr/bin/ld: cannot find -lBoost::thread
Ref:
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.12-Ic-200/Bounding_volumes/TestReport_lrineau_Fedora-Release.gz
2018-03-16 11:42:01 +01:00
af6d9ab3bb
Better calls to find_package(Boost) for CGAL::CGAL_Core
2018-03-14 23:07:02 +01:00
68a48e6b91
Remove obsolete code
...
Now that we use imported target, or aliases, then that code with lots
of `find_package` is no longer used.
2018-03-14 23:06:19 +01:00
b4534f51b4
Remove the duplicate -DCGAL_HEADER_ONLY
2018-03-14 23:06:01 +01:00
de1753566b
Speed improvement with CGAL_HEADER_ONLY and WITH_{tests|examples}..
...
When `CGAL_HEADER_ONLY` and `WITH_{examples|tests|demos}`, then only
the first call to `find_package(CGAL)` does the job. The subsequent
calls return very fast, by caching the results in global properties.
2018-03-14 23:04:09 +01:00
c17e0497ae
Store values in global properties
...
When `WITH_{examples|demos|tests}` is `ON`, `CGAL_SCM.cmake` is
included by each sub-directory. With this patch, the values of
`CGAL_SCM_BRANCH_NAME` and `CGAL_CREATED_GIT_HASH` are stored in
global properties, and retrieved, instead of forking two `git` at each
use of the module.
2018-03-14 22:38:05 +01:00
4070f70d4b
Fix issue #1580
...
Fix the issue "CMake error when WITH_CGAL_Qt5 is set to ON then
OFF" (#1580 ).
The previous CMake code was using a `file(GLOB)` to discover the list
of configured libraries, whereas that list is known by CMake.
2018-03-14 16:33:11 +01:00
e60ad2ac48
Fix bug introduced by PR #2846
...
If one tries to configure CGAL libraries with `CGAL_HEADER_ONLY=ON`,
but with `WITH_{examples|demos}` then one must define the target
`CGAL_Qt5_moc_and_resources`.
The bug was introduced by:
https://github.com/CGAL/cgal/pull/2846/files#diff-1f18376f411977629f9d9d36d018438dL54
2018-03-14 15:35:27 +01:00
a06d390fd4
Merge pull request #2910 from luis4a0/Algebraic_kernel_d-RS_MPFR_compatibility-Luis
...
Algebraic kernel d RS-Fix compatibility of MPFR, MPFI and RS.
2018-03-09 18:41:16 +01:00
a8c8d6f152
Fix MPFR/MPFI check when MPFI is not present.
2018-03-08 10:05:26 -03:00
ec8ddadac8
Check that MPFR/MPFI versions match.
...
MPFI >=1.5.2 only works with MPFR >=4.0.0.
MPFI < 1.5.2 only works with MPFR < 4.0.0.
This check is performed at CMake level, when configuring MPFI.
2018-03-08 10:12:42 +01:00
3768e905ae
Fix CGAL_ENABLE_CHECK_HEADERS
...
List of the fixes:
- The headers from the .cpp files were not processed (wrong regular
expression for `awk`),
- `CGAL_COMPUTE_DEPENDENCIES` is now removed (unified with
`CGAL_ENABLE_CHECK_HEADERS`).
- All `dependencies` files has an empty line (because of
`include/CGAL/version.h` in the build directory).
- Fix the name of the target `pkg_<package>_deps`
2018-03-06 18:43:39 +01:00
c64596903d
Set the default value of CGAL_DEV_MODE from the env variable
...
If the environment variable `CGAL_DEV_MODE` is set to a "true" value,
according to CMake, then the `CGAL_DEV_MODE` CMake option is `ON` by
default.
https://cmake.org/Wiki/CMake/Language_Syntax#CMake_supports_boolean_variables .
> CMake considers an empty string, "FALSE", "OFF", "NO", or any string
> ending in "-NOTFOUND" to be false. [..] Other values are true.
2018-02-21 15:32:56 +01:00
e6967d0887
Merge pull request #2846 from lrineau/Installation-fix_CGAL_HEADER_ONLY-GF
...
Fix CGAL_HEADER_ONLY
2018-02-19 14:28:43 +01:00
7e8e70a005
Merge pull request #2799 from lrineau/Installation-Add_CGAL_DEV_MODE-GF
...
Add CGAL_DEV_MODE
2018-02-19 14:27:33 +01:00
9b06a70e91
Merge pull request #2819 from afabri/CGAL-remove_SCL_SECURE_NO_DEPRECATE-GF
...
Address the warning concerning SCL_SECURE for VC++
2018-02-19 14:26:23 +01:00
dd739cd31b
Do not declare the target CGAL_Qt5_moc_and_resources when useless
...
- .. if `CGAL_HEADER_ONLY` is not true,
- or if CMake is configuring CGAL "libraries".
2018-02-15 15:52:38 +01:00
Sebastien Loriot
Laurent Rineau
Simon Giraudot
Maxime Gimeno
Guillaume Damiand
Liangliang Nan
Mael Rouxel-Labbé
Luis Peñaranda