Commit Graph

825 Commits

Author SHA1 Message Date
Laurent Rineau bd14587987 Fix GMPXX 2018-04-04 10:56:53 +02:00
Laurent Rineau 7bb25993d6 GMPXX: Add CGAL_USE_GMPXX in header-only 2018-04-03 17:31:52 +02:00
Laurent Rineau 1384d24b99 add GMPXX support (work in progress) 2018-04-03 17:22:45 +02:00
Laurent Rineau 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
Laurent Rineau 1d0663da1d Remove one misleading sentence 2018-03-20 17:53:50 +01:00
Laurent Rineau 671933072c Guard the inclusion 2018-03-20 17:09:57 +01:00
Laurent Rineau f3b4302a08 Document the hook 2018-03-20 17:08:52 +01:00
Laurent Rineau 2d1cb94f5b Only monitor the accesses of type MODIFIED_ACCESS 2018-03-20 17:08:52 +01:00
Laurent Rineau 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
Laurent Rineau 66b4ec4214 Add a warning about the use of Debug or "" in CMAKE_BUILD_TYPE 2018-03-20 17:08:52 +01:00
Laurent Rineau 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
Laurent Rineau af6d9ab3bb Better calls to find_package(Boost) for CGAL::CGAL_Core 2018-03-14 23:07:02 +01:00
Laurent Rineau 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
Laurent Rineau b4534f51b4 Remove the duplicate -DCGAL_HEADER_ONLY 2018-03-14 23:06:01 +01:00
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Luis Peñaranda a8c8d6f152 Fix MPFR/MPFI check when MPFI is not present. 2018-03-08 10:05:26 -03:00
Luis Peñaranda 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 4e0cc55e4c Fix the CMake error
CMake does not like that the documentation of a CMake cache variable is
multiline. That triggers an error once the cache is re-loaded, the second
time.
2018-02-14 16:23:19 +01:00
Laurent Rineau 9a80f5ddd8 Merge pull request #2800 from jasjuang/master
prevent GCC flags propagating to NVCC, fixes #2775
2018-02-14 15:34:23 +01:00
jasjuang de47e36dac prevent GCC flags propagating to NVCC, fixes #2775 2018-02-09 09:46:50 -08:00
Andreas Fabri abe933a684 Address the warning concerning SCL_SECURE for VC++ 2018-02-09 15:00:14 +00:00
Maxime Gimeno a481d2651c Clean-up 2018-02-09 10:25:39 +01:00
Laurent Rineau 69ca424c5e Add CGAL_DEV_MODE 2018-02-06 15:08:54 +01:00
Maxime Gimeno 533fa91f41 remove classic package installation becaus eit is supposed to happen in install.sh 2018-02-02 12:08:05 +01:00
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
Laurent Rineau 4d6149647d <CGAL/CGAL_Ipelet_base.h> requires C++11, skip it
That header needs C++11 at least, and that does not play well with the
`check_headers` feature. So put it in the whitelist, so that it is not
tested along with the other headers.
2017-04-18 18:25:56 +02:00
Laurent Rineau a0155a70ed Add Sphinx documentation
The `Makefile` can be used to generate the documentation:

    make html

`sphinx-build` must be in the path.
2017-03-27 18:04:55 +02:00
Laurent Rineau 97352da979 Fix CGAL_Core and CGAL_HEADERS_ONLY_STEP_2 2017-03-27 18:04:55 +02:00
Laurent Rineau 7c97443e37 Add a backward compatibility
A few CMakeLists.txt modify `CGAL_3RD_PARTY_LIBRARIES` to add Boost or
TBB libraries to it. In this case, emit a `DEPRECATION` warning and do
link with `${CGAL_3RD_PARTY_LIBRARIES}`.
2017-03-27 18:04:54 +02:00
Laurent Rineau af38caef16 Better CMake API for TBB
- new CMake module `CGAL_target_use_TBB` that defines a function, that
  enables TBB per target.
- `UseTBB.cmake` is deprecated.
2017-03-27 18:04:54 +02:00
Laurent Rineau eb5f52869f Use the new API of target_link_libraries
... otherwise CMake warns about mixing old and new usages of that CMake
command.
2017-03-27 18:04:54 +02:00
Laurent Rineau a0c0227f7d Remove display messages
Anyway that lead to a bug when Qt5 was not found.
2017-03-27 18:04:53 +02:00
Laurent Rineau 7c18b22b4c Fix CGAL_TweakFindBoost
That module was using the useless macros `cache_set` and
`add_to_cached_list`.
2017-03-27 18:04:53 +02:00
Laurent Rineau fa0d681c23 Simplify and fix CGALConfig.cmake for header-only2 2017-03-27 18:04:53 +02:00
Laurent Rineau 98156dc1a7 CGAL_Setup${cgal_lib}CoreDependencies improve
- Now even CGAL_Core has one.
- The `${cgal_lib}_FOUND` are now set in those modules, after having chec
- For self-consistency, `Use_CGAL_Qt5_headers` is included by
  `CGAL_SetupCGAL_Qt5Dependencies`.
2017-03-27 18:04:52 +02:00
Laurent Rineau 9c96205a38 First prototype of a pure CGAL_HEADER_ONLY
That is the step 2 of the header-only effort.

Still to do:

  - make it work with `make install`
  - ensure that `CGAL_Core` is correctly handled with `CGAL_DISABLE_GMP`
2017-03-27 18:04:41 +02:00
Laurent Rineau 908bb2dc01 Fix Use_CGAL_Qt5_headers.cmake
Outside a build with `WITH_demos=TRUE`, that was probably buggy.
2017-03-27 17:23:27 +02:00
Laurent Rineau 9902457b0a Make CGAL_SCM.cmake define a function
... instead of launching the code. That will help launch it on other
directories.
2017-03-27 17:23:27 +02:00
Laurent Rineau 255c09f03b Simplify CGALConfig_binary.cmake.in 2017-03-27 17:23:27 +02:00
Laurent Rineau 2daba815b3 New way to use the CGAL_Qt5 extra files 2017-03-27 17:23:27 +02:00
Clement Jamin 6af02862de This comment is not true anymore 2017-03-27 17:23:27 +02:00
Clement Jamin e209c57269 Add -DCGAL_HEADER_ONLY when relevant 2017-03-27 17:23:27 +02:00
Laurent Rineau fade4c0eb4 Fix CGAL_HEADER_ONLY 2017-03-27 17:23:27 +02:00
Laurent Rineau 98890c9924 Fix the INTERFACE_INCLUDE_DIRECTORIES of CGAL 2017-03-27 17:23:27 +02:00
Clement Jamin 23a1c3ee54 Revert "This only has to be done in header-only mode"
This reverts commit ff3b3b01ab96485cd32564175833b68044806bee.
2017-03-27 17:23:27 +02:00
Clement Jamin 6f0efd931f Remove useless test 2017-03-27 17:23:26 +02:00
Laurent Rineau 5d5f6d4dae include CGAL_Macros.cmake in the CGALConfig.cmake 2017-03-27 17:23:26 +02:00
Clement Jamin dfb24b5340 Add comments 2017-03-27 17:23:26 +02:00
Clement Jamin b9909ddfb5 This only has to be done in header-only mode 2017-03-27 17:23:26 +02:00
Laurent Rineau a3ddaa132f Define and use a new CMake API for CGAL
For the moment, the new API is used only in:

- `examples/Mesh_2/CMakeLists.txt`
- `demo/Triangulation_2/CMakeLists.txt`
2017-03-27 17:23:26 +02:00
Clement Jamin 973b4e89b2 Fix bug in case ZLib is not found 2017-03-27 17:23:26 +02:00
Clement Jamin a2a3ad29b4 Use CGAL_SetupCGAL_Qt5Dependencies + remove useless test 2017-03-27 17:23:26 +02:00
Laurent Rineau c2fd460927 Use CGAL::CGAL_<lib> instead of CGAL_<lib> 2017-03-27 17:23:26 +02:00
Laurent Rineau f9835007e5 Use CGAL::CGAL instead of CGAL 2017-03-27 17:23:26 +02:00
Laurent Rineau 8f2fa4f637 Do not hardcode CGAL_Qt5
Use ${target} instead.
2017-03-27 17:23:26 +02:00
Laurent Rineau 429bfa4315 move the add_config_flag calls 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 b978620b29 Add an include guard 2017-03-27 17:13:15 +02:00
Laurent Rineau d87cfd9ed5 CMake: If MSVC/C++11, do not search for Boost.Thread for CGAL_Core
See for example that error, on a Windows platform that does not have any
compiled Boost libraries.

https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.10-Ic-121/Polygon_Demo/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Debug-64bits.gz
2017-02-09 12:46:36 +01:00
Laurent Rineau b73a88babc CGAL_Core MemoryPool<T> will always use Boost.Thread with g++
Because of bug in gcc, even if the C++11 `thread_local` keyword can be
used, it cannot be used for the TLS static member of the class template
`MemoryPool<T>`. That triggers a bug in gcc (tested with g++ 6.3.1):
```
.../include/CGAL/CORE/MemoryPool.h:113:25: error: redefinition of 'bool __tls_guard'
 MemoryPool<T, nObjects> MemoryPool<T, nObjects>::memPool;
                         ^~~~~~~~~~~~~~~~~~~~~~~
.../include/CGAL/CORE/MemoryPool.h:113:25: note: 'bool __tls_guard' previously declared here
.../include/CGAL/CORE/MemoryPool.h:113: confused by earlier errors, bailing out
Preprocessed source stored into /tmp/cc4xCWuR.out file, please attach this to your bugreport.
```

The bug seems to be from g++ >= 5:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54948
2017-02-08 17:05:13 +01:00
Sébastien Loriot a89ccb10e7 remove non UTF-8 characters 2017-01-19 15:20:26 +01:00
Michel Zou 722e37c4d7 MPIR support 2016-12-23 22:32:32 +01:00
Laurent Rineau 204f9d080a Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch' 2016-12-05 12:19:36 +01:00
Laurent Rineau f99b898cdf Use LEDA linker flags 2016-12-02 10:57:18 +01:00
Laurent Rineau 205bc84874 Fix FindLEDA with clang 2016-11-30 10:40:04 +01:00
Laurent Rineau 5b3c44a3ef Merge pull request #1637 from sloriot/CGAL-fix_install_prefix
Add a hardcoded fall back for the installation prefix
2016-11-03 11:03:24 +01:00
Sébastien Loriot f674cc1cd1 add a hardcoded fall back for the installation prefix
in case of no common setting, the installation cannot be
relocated automatically
2016-10-31 15:52:11 +01:00
Laurent Rineau 2c4e047f58 Do not early exit if IPE_FULL_VERSION is not there
If `IPE_FULL_VERSION` is missing, that leads to a CMake error in
`CMakeLists.txt` files using it.
2016-10-25 11:17:10 +02:00
Laurent Rineau 0d5ddad5c3 Merge pull request #1534 from lrineau/CGAL-Allow_examples_to_use_cpp11_features-lrineau
Allow examples to use C++>=11 features
2016-10-17 10:03:05 +02:00
Laurent Rineau 54ce89f314 Merge pull request #1560 from lrineau/Installation-fix_CGAL_VERSION_issue_1559-lrineau
Fix CGAL_VERSION in CGALConfig.cmake
2016-10-17 10:01:11 +02:00
Laurent Rineau e5b441feaa Fix CGAL_VERSION in CGALConfig.cmake 2016-10-10 12:31:21 +02:00
Laurent Rineau 451577719c Merge pull request #1542 from lrineau/Installation-fix_CGAL_SetupBoostlrineau
try_run to detect the C++ version
2016-10-07 14:38:22 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau e8dede494e Avoir a CMake error
When the list `CMAKE_CXX_COMPILE_FEATURES` is empty, there was a syntax
error.
```
CMake Error at /mnt/testsuite/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake:27 (list):
  list sub-command REMOVE_ITEM requires two or more arguments.
Call Stack (most recent call first):
  CMakeLists.txt:75 (create_single_source_cgal_program)

```
2016-10-05 10:07:01 +02:00
Laurent Rineau c1b070dd51 Use try_run to detect the C++ version 2016-10-04 16:57:19 +02:00
Laurent Rineau 87a2248ab6 Do no test demos
New directory property named `CGAL_NO_TESTING`. If set to `TRUE`, then
the automatic generating of CTest test will be disabled.

(cherry picked from commit 5d540fc1989c86438090b0212883b15cd121cf92)
2016-09-30 19:58:56 +02:00
Laurent Rineau 038207bc15 Fix CTest
I broke the support for .cmd files in 3d36fe05b3.
2016-09-30 19:46:58 +02:00
Laurent Rineau 50d753350e Allow examples to use C++>=11 features
The macro `create_single_source_cgal_program` from
`CGAL_CreateSingleSourceCGALProgram` has been modified accordingly.

(cherry picked from commit 571659aaa32a30d7bfc0ce54a9d29c56079dca06)
2016-09-30 18:42:46 +02:00
Laurent Rineau bc03fae86c Add a whitelist
For now, `<CGAL/Linear_cell_complex_constructors.h>` is skipped.
2016-09-30 15:23:15 +02:00
Laurent Rineau 367da380f1 Move and regenerate list_of_documented_headers.cmake 2016-09-30 15:23:15 +02:00
Laurent Rineau 67e9da4770 FindIPE defines IPE_VERSION 2016-09-30 15:23:14 +02:00
Laurent Rineau b700a3f4da Fix a bug in the deps detection 2016-09-30 15:23:14 +02:00
Laurent Rineau ceb6961594 Remove a debug message 2016-09-30 15:22:28 +02:00
Laurent Rineau ed680537c9 WIP: compute packages dependencies, using the compiler 2016-09-30 15:22:26 +02:00
Laurent Rineau 4707b2ed29 Merge pull request #1443 from TManhente/master
Adds CMake package version file generation
2016-09-23 16:52:13 +02:00
Laurent Rineau d8b564e003 Use CGAL_add_test.cmake 2016-09-20 10:53:20 +02:00
Laurent Rineau 3d36fe05b3 WIP: the Arr_2 testsuite is now working!! 2016-09-20 10:53:20 +02:00
Laurent Rineau c0f36af442 Add a comment 2016-09-20 10:53:20 +02:00
Laurent Rineau 0a88180b51 Handle the case when a glob pattern is in .cmd
In that case, CMake must use globbing to interpret the content of the
.cmd file.
2016-09-20 10:53:20 +02:00
Laurent Rineau 545e80f18e Add a variable CGAL_CURRENT_SOURCE_DIR
Save the current source directory to `CGAL_CURRENT_SOURCE_DIR`. The
variable value is modified by a `CMakeLists.txt` file when it is
generated by `cgal_create_cmake_script` in the binary tree. The script
`cgal_create_cmake_script` itself it called by CMake, by the function
`process_CGAL_subdirectory` (see its definition in
`Installation/cmake/modules/CGAL_Macros.cmake`), called in
`(examples|test|demo)/CMakeLists.txt`.

Eventually, that variable value is supposed to be the directory to the
current sources, even if the current `CMakeLists.txt` is within the
binary tree.

That is used in `CGAL_CreateSingleSourceCGALProgram.cmake` for the CTest
support, so set correctly the current working directory (in the
directory of the tests/examples).
2016-09-20 10:53:20 +02:00
Laurent Rineau c30560143b Correctly handle `.cmd` files
The trick to use the CMake command `separate_arguments` to interpret the
lines of the `.cmd` file.
2016-09-20 10:53:20 +02:00