Commit Graph

3459 Commits

Author SHA1 Message Date
Laurent Rineau 7be5e3fbe5 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-23 08:44:39 +02:00
Laurent Rineau c1a13a0a1e Merge pull request #3949 from lrineau/Installation-fix_ctest_for_Andreas-GF
Fix CTest CGAL tests when binary dir is a sub-directory
2019-05-23 08:31:44 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Laurent Rineau 357fe1e486 Fix CTest CGAL tests when binary dir is a sub-directory
When the current binary dir is a sub-directory of the current sources
dir, then the recursive copy of the sources dir to `__exec_test_dir/`
cannot be done. In that case, do not setup the fixture
directory. Tests can still be run in the source directory (and pollute
it).
2019-05-20 12:18:18 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau c2e8365303 Actually, it can only work with CMake>=3.11 2019-05-10 17:47:58 +02:00
Laurent Rineau a0bfaee9eb Consider CGAL as an imported target 2019-05-10 17:31:17 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
Laurent Rineau 6cff0987ad Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:47:59 +02:00
Laurent Rineau 43cc6b2b2d CGAL_TweakFindBoost must be included before any call to FindBoost 2019-05-06 16:40:50 +02:00
Laurent Rineau 91d7fd4cb2 CGAL_TweakFindBoost must be included first 2019-05-06 16:34:07 +02:00
Laurent Rineau 212a088c5e That variable CGAL_TweakFindBoost was useless if not set 2019-05-06 16:33:42 +02:00
Laurent Rineau d8e23fefd2 CGAL requires CMake 3.1, that know about Boost 1.56 or before 2019-05-06 16:33:01 +02:00
Laurent Rineau dd703beff1 Merge pull request #3894 from lrineau/CGAL-Qt_version_5.9_or_later-GF
Document that Qt 5.9 or later is required
2019-05-06 15:01:58 +02:00
Laurent Rineau 623fd4f10f If BUILD_SHARED_LIBS is not defined, use Boost shared libs 2019-05-03 18:39:30 +02:00
Laurent Rineau 9ec3481be2 Document that Qt 5.9 or later is required 2019-04-30 16:41:44 +02:00
Laurent Rineau 7812d1b810 Boost: link with imported targets, if they exist 2019-04-29 16:36:04 +02:00
Laurent Rineau 3cb372be34 Do not search for Boost thread when not needed 2019-04-29 15:24:51 +02:00
Laurent Rineau af52b353d2 Boost 1.70 uses the CMake Config mode, now 2019-04-26 17:12:54 +02:00
Laurent Rineau a9fd0a3729 Bug-fix: Boost Thread is a dependency of CGAL_Core only for GNU/g++
Previously, it was documented to g++ only, but the code was just
checking "not MSVC", and thus clang was in the set.
2019-04-26 17:12:01 +02:00
Laurent Rineau 6615d1d12d Change the default value of CGAL_Boost_USE_STATIC_LIBS
It is now related to `BUILD_SHARED_LIBS`.
2019-04-26 17:11:24 +02:00
Laurent Rineau 36dba385a0 Add a bunch of new Boost versions 2019-04-26 17:10:49 +02:00
Laurent Rineau f3bc713103 Typo in a comment 2019-04-26 17:10:35 +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
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 b86532d357 Merge pull request #3830 from lrineau/Installation-fix_Windows_DLL_verinfo-lrineau
Fix CGAL DLLs verinfo on Windows
2019-04-08 15:57:31 +02:00
Laurent Rineau ae1e01c983 Merge pull request #3840 from lrineau/Installation-remove_GMP_IN_CGAL_AUXILIARY-GF
Remove (GMP|MPFR)_IN_CGAL_AUXILIARY
2019-04-08 15:57:29 +02:00
Laurent Rineau b392643a98 This branch now targets 4.13.2. 2019-04-05 14:50:41 +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 5a67ea92fc Fix the verinfo of CGAL DLLs, on Windows
And fix the test files.
2019-04-03 14:15:58 +02:00
Laurent Rineau 85047bcb61 Sneak a new feature in this branch: detect unused .cpp files
For the moment, the feature is far from being ready:

- in case of header-only, the .cpp sources files of CGAL libraries are
  reported,

- when a dependency for a test/examples is missing, the corresponding
  .cpp files is reported,

- and I have no clue which CMake version is required.

But I found real issues.

By default, the feature is OFF. It will only be activated if the CMake
variable or cache variable `CGAL_CHECK_UNUSED_CPP_FILES` is true. We
might activate it on a per-directory basis... or have it by default,
and deactivate it per-directory. We'll see. For the moment, let's keep
it deactivated.
2019-04-03 14:11:50 +02:00
Laurent Rineau 57a41b3d2a Towards CGAL-4.14.1 2019-03-29 15:59:03 +01:00
Laurent Rineau 84b9328619 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-29 15:49:12 +01:00
Laurent Rineau 8c4032262f Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
Fix the order of link when GMP is a static lib
2019-03-28 16:49:51 +01:00
Laurent Rineau 99ca804f6d Maybe tonight's internal release will be CGAL-4.14 final 2019-03-28 16:45:09 +01:00
Laurent Rineau 4b7cc4a896 Fix the order of link of GMPXX when GMP is a static library. 2019-03-28 09:04:03 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Laurent Rineau c988d7d1af Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
Fix the order of link when GMP is a static lib
2019-03-27 18:04:59 +01:00
Laurent Rineau e9f36ff557 Prepare for CGAL-4.14-beta4 2019-03-27 18:03:07 +01:00
Laurent Rineau 310ce89b91 Fix the order of link when GMP is a static lib 2019-03-27 17:51:24 +01:00
Laurent Rineau ea145c71fe Merge pull request #3759 from maxGimeno/Cross_compilation-Update_scripts-GF
Testsuite : Use ctest
2019-03-26 17:01:56 +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 bc6954af01 Fix an error in Fedora RPM
```
CGAL-devel.x86_64: E: zero-length /usr/lib64/cmake/CGAL/config/support/test_syntaxonly.cpp
```
https://taskotron.fedoraproject.org/artifacts/all/bf72d02c-4aff-11e9-a48a-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log
2019-03-26 10:49:00 +01:00
Maxime Gimeno 43167252fa Fix cin management in CGAL_add_tests 2019-03-21 11:37:39 +01:00
Laurent Rineau 6eab4c014c Update the handle of .cin files with CGAL_RUN_TESTS_THROUGH_SSH 2019-03-21 09:52:53 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau 4782ea1665 Fix the *installed* header-only CGALConfig.cmake
The previous installed version of `CGALConfig.cmake`, when
`CGAL_HEADER_ONLY` is true, was hard-coding a path `../../../`,
relative to the location of itself. It might be that the CMake modules
are not installed in a sub-directory with three components, relatively
to the prefix.

That way of doing it buggy. And that triggered issue with the cgal
port in vcpkg:

  https://github.com/Microsoft/vcpkg/pull/5734

This patch is just another hack: it hardcodes that the relative path
can be any of:

  - `../`,
  - `../../`, or
  - `../../../`.
2019-03-19 16:49:31 +01:00
Maxime Gimeno 1a6ef33010 WIP from git and upload to private page 2019-03-14 16:36:11 +01:00
Laurent Rineau 43d1948396 master now targets a possible CGAL-4.14-beta3 2019-03-13 17:15:45 +01:00