Commit Graph

691 Commits

Author SHA1 Message Date
Maxime Gimeno 21745bea1e Ignore packages without dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 1dc6a0d66c Add a script in Scripts/developers_scripts thatcheck if there are differencies in the dependencies of packages 2018-02-02 12:08:05 +01:00
Maxime Gimeno d577ee75a1 remove Build Dir from dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno 9fc057e1cf remove list and list generator for documented headers and make compute_dependencies implied by enable_check_header 2018-02-02 12:08:05 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Maxime Gimeno 11a7f9720f get the list of documented headers at configuring time 2018-02-02 12:04:21 +01:00
Laurent Rineau 25c01d485c Merge pull request #2773 from maxGimeno/Mesh_IO-Fix_c3t3_plugin-GF
Polyhedron demo: Fix c3t3 IO plugin when used with TBB
2018-01-31 18:30:20 +01:00
Laurent Rineau 67f4ab82af Merge pull request #2723 from MaelRL/PMP-Graph_partition-GF
BGL Small feature: Graph partitioning
2018-01-31 18:29:59 +01:00
Maxime Gimeno f46e805c77 Make inherit the usage of TBB in the cmake macro 2018-01-30 14:09:47 +01:00
Laurent Rineau e8fca04385 Merge pull request #2691 from lrineau/Installation-fix_Boost_thread_required_or_not-GF
Installation: fix the detection of C++11 and the need for Boost Thread
2018-01-17 10:42:09 +01:00
Laurent Rineau e2f89318e5 Improve scripts 2018-01-11 16:52:35 +01:00
Mael Rouxel-Labbé 17e46dab7d Added partition operations to BGL 2018-01-09 18:06:02 +01:00
Laurent Rineau 42b11ddf29 Revert the merge of PR #2478
This reverts the merge commit 46cc91e787 onto
488c3e2879.
2018-01-04 17:54:08 +01:00
Laurent Rineau c08329e93f Fix the use of Boost, on Windows
Now the branch requires CMake>=3.5. For CMake between 3.1 and 3.4,
included, it is not possible to compile CGAL libraries using C++11 or
later, and then compile a user program with C++03.
2018-01-04 11:45:40 +01:00
jasjuang 374bd7e223 fix incorrect INTERFACE_INCLUDE_DIRECTORIES 2018-01-02 08:06:13 -08:00
Laurent Rineau 1016c43195 Fix detection of Boost.Thread vs. C++11
This allows to build CGAL non-header-only with C++11, and then use C++03 is
a user-project: the need for Boost.Thread is reevaluated.
2017-12-19 15:56:30 +01:00
Laurent Rineau 02d7260dc1 Store the detection of C++11 in a CMake global property
That avoids to re-detecting it again and again.
2017-12-19 15:56:02 +01:00
Laurent Rineau e80136e750
Merge branch 'master' into Aos_2-surface_sweep-efif 2017-12-07 15:00:47 +01:00
Efi Fogel 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
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 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
Laurent Rineau 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
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 477b12dd83 Hack for the CGAL test suite (cont.)
Follow-up to:
> commit 249aed9fd1
> Author: Laurent Rineau <laurent.rineau@cgal.org>
> Date:   Thu Nov 23 17:06:21 2017 +0100
>
>     Hack for the CGAL test suite
2017-11-30 11:15:38 +01:00
Laurent Rineau 5c7958dc08 Improve CGAL_target_use_TBB
The use of TBB by a target is private.
2017-11-30 11:12:11 +01:00
Andreas Fabri ea95e2b2eb CGALConfig.cmake changes the CMAKE_MODULE_PATH
Maybe a temnporary "solution".

Laurent Rineau
2017-11-30 10:07:53 +00:00
Laurent Rineau a2c513f080 QGLviewer depends on the lib GLU 2017-11-29 11:17:31 +01:00
Laurent Rineau 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Laurent Rineau 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
Laurent Rineau 0f63e872c1 Fix when Qt5 is not found 2017-11-28 10:28:50 +01:00
Laurent Rineau d44f144a90 Restore the missing file 2017-11-27 10:18:42 +01:00
Laurent Rineau 249aed9fd1 Hack for the CGAL test suite 2017-11-23 17:06:47 +01:00
Laurent Rineau ce9399d423 Display compiler and linker flags 2017-11-23 17:06:46 +01:00
Laurent Rineau 9eb2e30745 Deal with the macro CGAL_TEST_SUITE in header-only 2017-11-23 17:06:46 +01:00
Laurent Rineau a2a5ca91a1 Unify CGAL_HEADER_ONLY and CGAL_HEADER_ONLY_STEP_2 2017-11-23 17:06:46 +01:00
Laurent Rineau c0ad644269 Correct syntax for target_compile_definitions 2017-11-23 16:41:21 +01:00
Laurent Rineau 876e4f8321 Rename CGAL_Qt5_extras to CGAL_Qt5_moc_and_resources 2017-11-22 13:01:06 +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
Laurent Rineau 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
Laurent Rineau fe139a8a7a Fix a typo 2017-11-21 09:51:55 +01:00
Laurent Rineau 9c350f2c47 Fix CMake errors in CGAL demos, with CMake<3.4 2017-11-20 10:41:44 +01:00
Laurent Rineau cf6522dba6 Fix CMake error on Windows about Boost.Thread and CGAL_Core 2017-11-20 10:40:45 +01:00
Laurent Rineau 891a83840e Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF 2017-11-17 15:03:57 +01:00
Laurent Rineau 8a260c4c32 Remove CGAL setup flags
@afabri This commit removes our tricks with the compilation flags.
2017-11-17 12:57:12 +01:00
Laurent Rineau 1dd41508fe Fix the syntax error with CMake<=3.3 2017-11-17 11:33:56 +01:00
Laurent Rineau 0c5ffa9968 Fix Boost usage on Windows 2017-11-17 11:06:32 +01:00
Laurent Rineau 21dabf1b1b Add compilation tests for demos 2017-11-16 18:45:33 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Efi Fogel 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
Laurent Rineau 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
Laurent Rineau 6aae344f9c Enable CTest from sub-directories of CGAL 2017-11-15 18:43:44 +01:00
Laurent Rineau ffe500eb29 Remove the deprecation warning, for now. 2017-11-15 17:29:45 +01:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01: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 489e1b2ae1 Remove debug message 2017-11-15 14:47:34 +01:00
Laurent Rineau 3f3f5b1a52 Do not rely on CMAKE_MODULE_PATH 2017-11-15 14:45:12 +01:00
Laurent Rineau fe24a4db68 Explicit the dependencies of QGLViewer 2017-11-14 14:08:55 +01:00
Laurent Rineau 1d63eeb5dc Add support for testing on Android 2017-11-14 10:39:35 +01:00
Laurent Rineau 264c23294f Ease the cross-compilation 2017-11-14 10:38:51 +01:00
Laurent Rineau 283f8138d8 CGAL_Core needs Boost.Thread 2017-11-13 14:41:03 +01:00
Laurent Rineau 03f84dc94b Handle the compiler flags
That setup was previously in `Installation/CMakeLists.txt`.
2017-11-13 14:28:51 +01:00
Laurent Rineau 8c44bceedd Fix a typo 2017-11-13 13:51:23 +01:00
Laurent Rineau 838217a153 CGAL_CURRENT_SOURCE_DIR is no longer used/filled 2017-11-13 11:49:07 +01:00
Laurent Rineau 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
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau 260c4dac61 Fix the API of cgal_add_test 2017-11-03 15:05:35 +01:00
Laurent Rineau 252eb66dc2 Split cgal_add_test further, with the new cgal_setup_test_properties 2017-11-03 11:13:49 +01:00
Laurent Rineau 855d995e1e Improvements
- split `cgal_add_test()` into `cgal_add_test()` and
  `cgal_add_compilation_test()`

- `cgal_add_test()` have more parameters:
  - an optional custom `TEST_NAME`,
  - extra arguments to use for the test.

- Add CTest support for `test/Sweep_line_2/`
2017-11-03 09:34:55 +01:00
Laurent Rineau 633374027b Do not run a test if the compilation failed
The test binary may have been compiled in a previous compilation.
But if the current compilation failed, do not run the test.
2017-10-26 19:50:40 +02:00
Laurent Rineau 6c24ed92e5 Deal with comments (`#`) in test/Set_movable_separability_2/*.cmd 2017-10-24 11:46:40 +02:00
Laurent Rineau 1fbdd79363 Avoid adding the same test twice 2017-10-23 16:10:06 +02:00
Laurent Rineau 45d60917e4 Use CMake 3.7 fixtures, to execute in a dedicated directory 2017-10-20 17:02:32 +02:00
Laurent Rineau e73c95d4cd Do not test demos 2017-10-20 17:01:43 +02:00
Laurent Rineau 9a127c6f5d Add CMake option CGAL_CTEST_DISPLAY_MEM_AND_TIME
"Display memory and real time usage at end of CTest test outputs"
2017-10-20 10:26:11 +02:00
Laurent Rineau a63cfa9612 Parse the XML file Test.xml from `ctest -D`
... eventually, that will help move from our testsuite scripts to
CTest testsuite, plus CDash.
2017-10-20 00:15:04 +02:00
Laurent Rineau 63f5286372 Merge pull request #2375 from sloriot/Cmake-remove_FindCGAL
Remove files no longer needed since CGAL uses the config mode of cmake
2017-08-28 12:49:55 +02:00
Sébastien Loriot a3cbacd968 remove files no longer needed since CGAL uses the config mode of cmake 2017-08-25 17:00:22 +02:00
Simon Giraudot b88deb3759 Rename Efficient_RANSAC_traits as Shape_detection_traits (same for concept) 2017-08-01 15:45:06 +02:00
Laurent Rineau fb458b9506 Whitelist also the (read|write)_ply_points.h 2017-07-11 11:58:53 +02:00
Laurent Rineau 2d286d5e79 Add the files to the whitelist 2017-07-11 11:58:53 +02:00
Simon Giraudot 8aed657e64 Check for LASLIB_INCLUDE_DIR to make sure LASlib is found 2017-07-11 11:58:52 +02:00
Jane Tournois 4e2982c15a add hints to find LASlib (helps on windows) 2017-07-11 11:58:52 +02:00
Simon Giraudot bd94c3005b Move USE_AS_DLL as a temporary definition around LASlib header 2017-07-11 11:58:52 +02:00
Jane Tournois 55c1972c22 add macro USE_AS_DLL to decl import 2017-07-11 11:58:52 +02:00
Simon Giraudot 1a53899c4b Correct FindLASLIB with CGAL fork of LASLIB 2017-07-11 11:58:50 +02:00
Simon Giraudot 9a77eef553 Unify cmake behavior with LASlib 2017-07-11 11:58:50 +02:00
Simon Giraudot f4fea04a4d Add definition CGAL_LINKED_WITH_LASLIB 2017-07-11 11:58:48 +02:00
Simon Giraudot a79d7be088 New example for LAS reader 2017-07-11 11:58:47 +02:00
Laurent Rineau c4438a472b Merge branch 'master' into Aos_2-surface_sweep-efif 2017-07-05 15:39:09 +02:00
Laurent Rineau 981d271774 Merge pull request #2181 from gdamiand/patch-1
Update CGAL_SetupFlags.cmake
2017-06-30 16:52:07 +02:00
Mael Rouxel-Labbé f860f8c2c7 Replaced pointer to licence with licence itself 2017-06-22 16:17:13 +02:00
Mael Rouxel-Labbé b432ff351b Fixed permissions 2017-06-22 16:15:57 +02:00
Andreas Fabri 602e6b456f find_package SuiteSparse 2017-06-22 16:15:57 +02:00
Laurent Rineau f6d87bc3a5 Merge pull request #2172 from Geopipe/usecgalspam
Flag to prevent blanking linking flags from being applied
2017-06-21 14:44:40 +02:00
Guillaume Damiand 2a5dfb149a Update CGAL_SetupFlags.cmake
Allows to use the 4 possible built types Release, Debug, RelWithDebInfo or MinSizeRel.

(see https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html)
2017-06-15 19:03:06 +02:00
Laurent Rineau c25e4997ef Fix the indentation 2017-06-15 17:38:34 +02:00
Thomas "elfprince13" Dickerson 0d13f433f7 flag to prevent blanking linking flags from being applied 2017-06-13 19:03:16 -04:00
Laurent Rineau b4f3d79b9b Make CTest build the targets 2017-06-09 16:50:06 +02:00
Efi Fogel 3e6de6b439 Renamed sweep-line to surface-sweep and cleaned up 2017-05-27 12:30:41 +03:00