Commit Graph

3138 Commits

Author SHA1 Message Date
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
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +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 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +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 c27f2a209d Rename changes.md to CHANGES.md 2018-03-05 11:26:06 +01:00
Laurent Rineau d485c73c7a Fixes after review by Jane T. and Simon G. 2018-02-27 15:43:17 +01:00
Laurent Rineau 4dd581137a Proposal of announcement for CGAL-4.12-beta1 2018-02-27 15:30:55 +01:00
Laurent Rineau 441170768d Prepare CGAL-4.12-beta1 2018-02-25 20:36:59 +01:00
Laurent Rineau 758688beba Merge pull request #2837 from afabri/CGAL-no_return-GF
Define CGAL_NORETURN also for VC++
2018-02-23 17:34:41 +01:00
Laurent Rineau 32a6cd7743 Merge pull request #2864 from lrineau/Installation-improve_CGAL_DEV_MODE-lrineau
Set the default value of CGAL_DEV_MODE from the env variable
2018-02-23 17:34:24 +01:00
Laurent Rineau 376f3d6d2c Merge pull request #2863 from lrineau/CGAL-remove_KDS-lrineau
Remove Kinetic_data_structures and Kinetic_framework from CGAL
2018-02-23 17:34:11 +01:00
Laurent Rineau 0140fbd94d Merge pull request #2830 from maxGimeno/CHECK_HEADER-Add_a_flag
CGAL_ENABLE_CHECK_HEADERS implies CGAL_PROFILE
2018-02-23 17:26:08 +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 a2e829fab3 Remove Kinetic_data_structures and Kinetic_framework from CGAL 2018-02-21 11:02:35 +01:00
Laurent Rineau 6553d7a9b3 Fix check_headers in master 2018-02-20 10:59:04 +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 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +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 72aab1189a Add the CMake option CGAL_HEADER_ONLY
This was already a CMake cache variable that is used a lot, but it was not
yet visible in the CMake GUI.
2018-02-15 15:51:27 +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
Andreas Fabri bcbbf35dad Define CGAL_NORETURN also for VC++ and move the macro before the functions 2018-02-14 14:51:40 +00: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
Maxime Gimeno a3409eb829 Change to compile flag 2018-02-14 11:04:08 +01:00
Maxime Gimeno cb5bf32f09 Add -DCGAL_PROFILE if CGAL_ENEABLE_CHECK_HEADERS is ON. 2018-02-14 10:26:03 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +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 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 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
Andreas Fabri f4ec38e27c STL_extensions 2018-01-18 14:15:21 +00:00
Andreas Fabri 257b180351 Triangulation 2018-01-18 13:56:10 +00:00
Andreas Fabri fa92aa49f7 Nef 2018-01-18 10:43:57 +00:00
Andreas Fabri 799260f604 Poisson surface reconstruction 2018-01-18 10:05:01 +00:00
Andreas Fabri 5efce459da Mesh_3 2018-01-18 08:49:52 +00:00
Andreas Fabri e34529aa9a PSP 2018-01-17 21:17:51 +00:00
Andreas Fabri 2e14ff9f04 Kernel 2018-01-17 19:59:11 +00:00
Andreas Fabri 43d2ecb521 Triangulation_3 2018-01-17 16:57:46 +00:00
Andreas Fabri fb51a69c7c Mesh_2 2018-01-17 16:50:21 +00:00
Andreas Fabri 6c791f161a Triangulation_2 2018-01-17 16:12:12 +00:00
Andreas Fabri 6cc385c6ec Number_types 2018-01-17 15:47:18 +00:00
Mael Rouxel-Labbé 5f3c4608dd
Fix typo in changes.md 2018-01-17 16:10:04 +01:00
Andreas Fabri cbf3a16471 libs compile without warning 2018-01-17 15:02:32 +00:00
Mael Rouxel-Labbé 89b1ab66ae Changed changes.md 2018-01-17 15:55:36 +01:00
Simon Giraudot fcf7d97953 Update changes.md 2018-01-17 11:58:25 +01:00
Laurent Rineau 4b3244384f Merge pull request #2695 from sgiraudot/Point_set_shape_detection-Introducing_callbacks-GF
Shape Detection: Add Callback Mechanism
2018-01-17 10:42:41 +01:00
Laurent Rineau bf52faed93 Merge pull request #2694 from sgiraudot/Point_set_processing-Use_named_parameters-GF
Point Set Processing: Use Named Parameters
2018-01-17 10:42:33 +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
Simon Giraudot d1179b5b04 Add cpp11::function (using either std::function or boost::function) 2018-01-12 09:54:14 +01:00
Simon Giraudot 2166ea49b6 Update changes.md 2018-01-12 09:54:14 +01:00
Laurent Rineau e2f89318e5 Improve scripts 2018-01-11 16:52:35 +01:00
Laurent Rineau 66676b6a35 Merge pull request #2707 from sloriot/Scripts-enhance_release_creation_with_cmake
Improve release creation cmake script
2018-01-11 16:47:18 +01:00
Simon Giraudot 56d8de398e Update changes.md 2018-01-10 16:39:33 +01:00
Mael Rouxel-Labbé 17e46dab7d Added partition operations to BGL 2018-01-09 18:06:02 +01:00
Sébastien Loriot bd4f61fa54 remove old Makefile to build html doc 2018-01-08 21:12:50 +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
Sébastien Loriot 9fe73a801e Merge pull request #2552 from maxGimeno/PMP_does_intersect-GF
PMP: do_intersect
2018-01-04 15:34:18 +01:00
Sebastien Loriot e3f78ff10e
Merge pull request #2545 from maxGimeno/PMP_orient_connected_components-GF
PMP :  Orient_connected_components function
2018-01-04 15:31:21 +01:00
Laurent Rineau fa9f256781 Fix the use of __has_cpp_attribute
When =std=c++03 is used, `__has_cpp_attribute(something)` still returns
non-zero for valid C++11 attributes.

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81513
2018-01-04 11:47:13 +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
Sébastien Loriot 93b5fd9f62 rephrasing 2018-01-03 13:43:15 +01:00
Sébastien Loriot e318a89a78 handle CGAL_GIT_HASH and CGAL_RELEASE_DATE in version.h 2018-01-03 11:13:19 +01:00
Sébastien Loriot 8b6deff272 generate VERSION 2018-01-03 10:46:22 +01:00
jasjuang 374bd7e223 fix incorrect INTERFACE_INCLUDE_DIRECTORIES 2018-01-02 08:06:13 -08:00
Sebastien Loriot 6bbfed5352
Merge pull request #2236 from efifogel/Aos_2-surface_sweep-efif
Aos 2 surface sweep
2017-12-22 22:32:15 +01:00
Sébastien Loriot d1597f2fb5 Merge branch 'maxGimeno/PMP_orient_connected_components-GF' into cgal/master 2017-12-19 17:34:51 +01:00
Laurent Rineau 08bc15141e
Merge branch 'master' into Aos_2-surface_sweep-efif 2017-12-19 17:20:28 +01: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 fe81d31ec2
Merge branch 'master' into PMP_does_intersect-GF 2017-12-13 16:25:32 +01:00
Sébastien Loriot 2303583ce6 add missing backticks 2017-12-13 10:28:10 +01:00
Sébastien Loriot a639cdc7c6 add missing backticks 2017-12-13 10:17:45 +01:00
Maxime Gimeno e0eca970d2 Remove changes.html 2017-12-13 10:17:45 +01:00
Maxime Gimeno 6c42ce6958 Doc review 2017-12-13 10:17:08 +01:00