Commit Graph

393 Commits

Author SHA1 Message Date
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Laurent Rineau e828e60b8d Merge pull request #4521 from maxGimeno/Installation-Fix_CGAL_WITH_Qt5-maxGimeno
Fix CGAL_Qt5_FOUND issue
2020-02-14 14:39:11 +01:00
Maxime Gimeno 8645e59f00 Fix Qt5 COMPONENT installation and don't copy Qt/* at installation step. 2020-02-12 14:24:29 +01:00
Laurent Rineau 97a8128f06 Merge pull request #4271 from maxGimeno/Installation-GMPXX-maxGimeno
Set GMPXX ON if detected
2020-02-07 16:25:11 +01:00
Maxime Gimeno c7c35c24f7 Remove remaining WITH_GMPXX in list 2019-12-16 09:37:52 +01:00
Maxime Gimeno 0783723f47 restore wrongly deleted lines 2019-12-16 09:30:54 +01:00
Maxime Gimeno 64bce3fd90 Remove tehe option WITH_GMPXX completely 2019-12-13 16:31:34 +01:00
Laurent Rineau 8db15111a4 Merge branch 'releases/CGAL-5.0-branch' into Installation-fix_check_of_documented_headers-GF 2019-12-09 15:08:33 +01:00
Laurent Rineau 9149d26492 Fix check headers
Before this commit, headers with their own documentation pages, but
not referenced in other documentation pages, were not considered as
documented. This is a fix.
2019-12-09 15:07:10 +01:00
Laurent Rineau e6510c7b5c Merge pull request #4285 from lrineau/Installation-fix_CMake_scripts_for_installed_header_only-GF
Fix CMake scripts for installed header-only version of CGAL
2019-10-15 16:31:30 +02:00
Laurent Rineau 08a42cf35b Fix the detection of CGAL_ROOT
On Debian, CMake files are in
`/usr/local/lib/x86_64-linux-gnu/cmake/CGAL/` are our previous heuristic fails.
2019-10-11 11:00:29 +02:00
Maxime Gimeno 5dd3c7ee83 Better test 2019-10-03 14:17:39 +02:00
Maxime Gimeno 60d3851a20 Set WITH_GMPXX ON if GMPXX is found in the cmake options of cgal 2019-10-03 13:35:35 +02:00
Laurent Rineau 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
Laurent Rineau dc93527270 Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
Fix CTest on windows
2019-09-05 14:56:25 +02:00
Laurent Rineau 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
Laurent Rineau 5705b9da93 Fix CMake warnings (since 3.15) 2019-08-19 16:18:52 +02:00
Sebastien Loriot 0dd30b1a68
Merge pull request #3900 from lrineau/CGAL-header_only_by_default-GF
Make CGAL_HEADER_ONLY the default in CGAL-5.0
2019-07-19 21:14:34 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Laurent Rineau 6842424fbd Make CGAL_HEADER_ONLY the default in CGAL-5.0 2019-06-17 15:06:57 +02:00
Laurent Rineau 268cb59ce1 Merge pull request #3739 from lrineau/Installation-remove_FindBLAS_LAPACK_TAUCS-GF
Remove support for BLAS, LAPACK, and TAUCS
2019-05-21 16:37:10 +02:00
Laurent Rineau 7bcad36d7e
Merge branch 'master' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-05-14 16:03:28 +02:00
Sébastien Loriot 1398af1b0b Merge remote-tracking branch 'cgal/master' into HEAD 2019-04-12 17:44:31 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Simon Giraudot 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
Laurent Rineau 68f321c58d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-04-08 15:58:27 +02:00
Laurent Rineau 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
Laurent Rineau d0cbf82b04 Remove the CMake variable CGAL_USE_GMP when CGAL_DISABLE_GMP is flipped 2019-03-27 14:16:50 +01:00
Laurent Rineau 15d74af234 Bump the SONAME of libCGAL_Qt5.so
```
ABI changes between build CGAL-4.14-0.1beta2.fc30 and its latest stable build
================================================================================

This file contains possible ABI changes which have occurred due to this package update against latest stable build available in koji for the given Fedora release.

If you want to filter out these kind of ABI changes in the future, you can add a proper .abignore file to this package. To know more about how to write one, please look at the wiki page https://fedoraproject.org/wiki/Taskotron/Tasks/dist.abicheck#filtering .

On armv7hl architecture
*************************

* No ABI change between:
CGAL-devel-4.13-3.fc30.armv7hl.rpm
CGAL-devel-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 8.88 second(s).

* ABI changes found between:
CGAL-4.13-3.fc30.armv7hl.rpm
CGAL-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 11.54 second(s). Please review them.

================ changes of 'libCGAL_Qt5.so.13.0.2'===============
  Functions changes summary: 0 Removed, 1 Changed, 0 Added function
  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable

  1 function with some indirect sub-type change:

    [C]'method CGAL::Qt::DemosMainWindow::DemosMainWindow(QWidget*, Qt::WindowFlags)' at DemosMainWindow_impl.h:62:1 has some indirect sub-type changes:
      return type changed:
        in pointed to type 'class CGAL::Qt::DemosMainWindow' at DemosMainWindow.h:52:1:
          type size changed from 544 to 608 (in bits)
          1 data member insertion:
            'QSettings CGAL::Qt::DemosMainWindow::settings', at offset 544 (in bits) at DemosMainWindow.h:129:1

================ end of changes of 'libCGAL_Qt5.so.13.0.2'===============

Removed binaries:
  /usr/lib/libCGAL_ImageIO.so.13.0.2, SONAME: libCGAL_ImageIO.so.13
Added binaries:
  /usr/lib/libCGAL_ImageIO.so.14.0.0, SONAME: libCGAL_ImageIO.so.14
* No ABI change between:
CGAL-demos-source-4.13-3.fc30.armv7hl.rpm
CGAL-demos-source-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 8.67 second(s).
```
https://taskotron.fedoraproject.org/artifacts/all/bfca5e3c-4aff-11e9-b891-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log
2019-03-26 10:49:31 +01:00
Laurent Rineau ca67ac5c1f Remove all mentions of BLAS, LAPACK, and TAUCS in our CMake scripts 2019-03-07 09:40:08 +01:00
Laurent Rineau 8eee6f3e0c Allow to have different SOVERSION for each CGAL libraries
In CGAL-4.14, I would like to have `libCGAL.so.13` (to keep
compatibility), but `libCGAL_Image.so.14` (to break compatibility).
2019-02-28 14:26:02 +01:00
Laurent Rineau 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
Laurent Rineau 1cb63b5e78 Bump the SONAME 2018-12-17 15:21:59 +01:00
Laurent Rineau 007a70e7cc Merge branch 'releases/CGAL-4.12-branch' 2018-05-29 17:19:52 +02:00
Laurent Rineau 01574e7ab9 Partially revert 7cc46441b5
Partially revert 7cc46441b5 from the PR
https://github.com/CGAL/cgal/pull/3021

We want to override CGALConfig.cmake. The previous patch was wrong. That is
easier to forbid in-source builds in Git, anyway.
2018-05-28 15:22:19 +02:00
Laurent Rineau 2ad4781a05 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF
Infrastructure : Test compilation of headers
2018-05-28 13:58:19 +02:00
Laurent Rineau 265a81bf76 Merge pull request #2967 from maxGimeno/CGAL-With_QGLViewer-GF
CGAL_Qt5: include QGLViewer
2018-05-28 13:58:10 +02:00
Laurent Rineau d7d39e9036 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF
Infrastructure : Test compilation of headers
2018-05-28 11:00:39 +02:00
Laurent Rineau e4ff486963 Merge pull request #3110 from lrineau/Installation-better_check_headers-lrineau
Installation: better check_headers (for Travis)
2018-05-25 10:42:22 +02:00
Laurent Rineau 4ba33e17d3 Run the compiler a second time without -H in case of errors 2018-05-23 15:09:53 +02:00
Laurent Rineau 11d310bba0 Fix typo falg/flag 2018-05-23 15:09:53 +02:00
Maxime Gimeno 853bd3ceed Add a step to check_headers that tries to build a dummy cpp with all the checked headers. 2018-05-23 11:48:57 +02:00
Laurent Rineau cd79383d5b Fix `make install` with the tarball and header-only 2018-05-22 14:45:04 +02:00
Maxime Gimeno c0c7bd095d WIP: Include QGLViewer inside CGAL_qt5 2018-05-17 10:20:55 +02:00
Laurent Rineau ee61c2752c Fix CMake scripts when GMP or MPFR is found under auxiliary/ 2018-04-16 18:21:08 +02:00
Laurent Rineau 160d36af18 Fix `make install` in header-only 2018-04-16 12:08:33 +02:00
Laurent Rineau 7cc46441b5 Do not overwrite source files!
Fixes #3016.

Now the `CGALConfig.cmake` at the root of the Git repository is not
modified, even with an in-source configuration.
2018-04-13 11:28:17 +02: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 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 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