e2f89318e5
Improve scripts
2018-01-11 16:52:35 +01:00
374bd7e223
fix incorrect INTERFACE_INCLUDE_DIRECTORIES
2018-01-02 08:06:13 -08:00
e80136e750
Merge branch 'master' into Aos_2-surface_sweep-efif
2017-12-07 15:00:47 +01:00
f1483cfa25
Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
...
Merging Sebastien's fix to the surface-sweep cod.
Also, replaced all occurrences of '_SL_' with '_SS_'.
2017-12-07 15:56:00 +02:00
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
777717ba7e
Move config/ to cmake/modules/config/
...
That way, the directory will be installed along with CMake modules.
2017-12-06 12:53:05 +01:00
4343b756f0
Merge pull request #2636 from maxGimeno/Add_make_install_tests-GF
...
Test make install in travis
# Conflicts:
# Installation/cmake/modules/CGAL_Macros.cmake
2017-12-05 18:25:59 +01:00
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
477b12dd83
Hack for the CGAL test suite (cont.)
...
Follow-up to:
> commit 249aed9fd1
2017-11-30 11:15:38 +01:00
5c7958dc08
Improve CGAL_target_use_TBB
...
The use of TBB by a target is private.
2017-11-30 11:12:11 +01:00
ea95e2b2eb
CGALConfig.cmake changes the CMAKE_MODULE_PATH
...
Maybe a temnporary "solution".
Laurent Rineau
2017-11-30 10:07:53 +00:00
a2c513f080
QGLviewer depends on the lib GLU
2017-11-29 11:17:31 +01:00
6ec4c12031
Do not use OpenGL directly, but only using Qt5 OpenGL classes
2017-11-28 17:58:12 +01:00
4267df0a78
Fix get_dependency_version(..) when CGAL is installed
...
.. That is not really a fix, but any I plan to remove that code soon or
later!
2017-11-28 14:13:31 +01:00
0f63e872c1
Fix when Qt5 is not found
2017-11-28 10:28:50 +01:00
d44f144a90
Restore the missing file
2017-11-27 10:18:42 +01:00
249aed9fd1
Hack for the CGAL test suite
2017-11-23 17:06:47 +01:00
ce9399d423
Display compiler and linker flags
2017-11-23 17:06:46 +01:00
9eb2e30745
Deal with the macro CGAL_TEST_SUITE in header-only
2017-11-23 17:06:46 +01:00
a2a5ca91a1
Unify CGAL_HEADER_ONLY and CGAL_HEADER_ONLY_STEP_2
2017-11-23 17:06:46 +01:00
c0ad644269
Correct syntax for target_compile_definitions
2017-11-23 16:41:21 +01:00
876e4f8321
Rename CGAL_Qt5_extras to CGAL_Qt5_moc_and_resources
2017-11-22 13:01:06 +01:00
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
18caaba64d
Fix the "-fp-model strict" for Intel
...
`-fp-model strict` is two arguments, not one!
```
[ 4%] Building CXX object src/CGAL/CMakeFiles/CGAL.dir/all_files.cpp.o
cd /home/cgal_tester/build/src/cmake/platforms/CentOS7-ICC-2016-Release/src/CGAL && /opt/intel/compilers_and_libraries_2016.4.258/linux/bin/intel64/icpc -DCGAL_EXPORTS -I/home/cgal_tester/build/src/cmake/platforms/CentOS7-ICC-2016-Release/include -I/mnt/testsuite/include -w1 -O3 -DCGAL_NDEBUG -fPIC "-fp-model strict" -o CMakeFiles/CGAL.dir/all_files.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/CentOS7-ICC-2016-Release/src/CGAL/all_files.cpp
icpc: command line warning #10159 : invalid argument for option '-fp-model'
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.12-Ic-97/Installation/TestReport_lrineau_CentOS7-ICC-2016-Release.gz
2017-11-21 13:51:24 +01:00
fe139a8a7a
Fix a typo
2017-11-21 09:51:55 +01:00
9c350f2c47
Fix CMake errors in CGAL demos, with CMake<3.4
2017-11-20 10:41:44 +01:00
cf6522dba6
Fix CMake error on Windows about Boost.Thread and CGAL_Core
2017-11-20 10:40:45 +01:00
891a83840e
Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF
2017-11-17 15:03:57 +01:00
8a260c4c32
Remove CGAL setup flags
...
@afabri This commit removes our tricks with the compilation flags.
2017-11-17 12:57:12 +01:00
1dd41508fe
Fix the syntax error with CMake<=3.3
2017-11-17 11:33:56 +01:00
0c5ffa9968
Fix Boost usage on Windows
2017-11-17 11:06:32 +01:00
21dabf1b1b
Add compilation tests for demos
2017-11-16 18:45:33 +01:00
bbee705221
Add compilation tests for demos
2017-11-16 18:38:15 +01:00
7936109c6c
Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
...
Conflicts:
.travis.yml
.travis/packages.txt
Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h
Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h
Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_batched_pl_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_insertion_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_overlay_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_vert_decomp_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_batched_pl_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_insertion_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_overlay_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_batched_pl_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_vert_decomp_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h
Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_default_planar_topology.h
Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_basic_insertion_traits_2.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_batched_pl_ss_visitor.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_construction_ss_visitor.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_default_overlay_traits_base.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_insertion_traits_2.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_no_intersection_insertion_ss_visitor.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_ss_visitor.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_subcurve.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_traits_2.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_vert_decomp_ss_visitor.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h
CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp
Documentation/doc/Documentation/dependencies
Installation/include/CGAL/config.h
Snap_rounding_2/include/CGAL/Snap_rounding_2.h
Surface_sweep_2/examples/Surface_sweep_2/CMakeLists.txt
Surface_sweep_2/include/CGAL/Surface_sweep_2/No_intersection_surface_sweep_2_impl.h
Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_event_base.h
Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_utils.h
Surface_sweep_2/include/CGAL/Surface_sweep_2_algorithms.h
Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_event.h
Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h
Sweep_line_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h
Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h
Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h
Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h
Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h
Sweep_line_2/include/CGAL/Sweep_line_empty_visitor.h
2017-11-16 16:31:52 +02:00
6804eadd98
Fill the CMAKE_CONFIGURE_DEPENDS directory property
...
... with each `.cin` and `.cmd` files that are used.
2017-11-15 18:55:25 +01:00
6aae344f9c
Enable CTest from sub-directories of CGAL
2017-11-15 18:43:44 +01:00
ffe500eb29
Remove the deprecation warning, for now.
2017-11-15 17:29:45 +01:00
0681ac6dbc
Fix the TBB_USE_FILE warnings
2017-11-15 17:00:02 +01:00
a9365554c9
Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
...
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
489e1b2ae1
Remove debug message
2017-11-15 14:47:34 +01:00
3f3f5b1a52
Do not rely on CMAKE_MODULE_PATH
2017-11-15 14:45:12 +01:00
fe24a4db68
Explicit the dependencies of QGLViewer
2017-11-14 14:08:55 +01:00
1d63eeb5dc
Add support for testing on Android
2017-11-14 10:39:35 +01:00
264c23294f
Ease the cross-compilation
2017-11-14 10:38:51 +01:00
283f8138d8
CGAL_Core needs Boost.Thread
2017-11-13 14:41:03 +01:00
03f84dc94b
Handle the compiler flags
...
That setup was previously in `Installation/CMakeLists.txt`.
2017-11-13 14:28:51 +01:00
8c44bceedd
Fix a typo
2017-11-13 13:51:23 +01:00
838217a153
CGAL_CURRENT_SOURCE_DIR is no longer used/filled
2017-11-13 11:49:07 +01:00
c6068691fa
Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
...
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
0698f79aff
add SPDX identifier for files under the LGPL-3+ license
2017-11-12 10:17:50 +01:00
Laurent Rineau
jasjuang
Efi Fogel
Andreas Fabri
Sébastien Loriot