Commit Graph

2637 Commits

Author SHA1 Message Date
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 5725835fc3 Fix a bug
Do not add non-existent directories to `CGAL_INCLUDE_DIRS`.

CMake-3.5.2 complains about that in 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
Simon Giraudot 1385d5fc9b Add macros with old versions of boost 2017-02-27 14:21:20 +01:00
Simon Giraudot 6525d58fbf Fix error (removed lines by mistake) in config.h 2017-02-27 10:03:51 +01:00
Simon Giraudot 588c8634b9 Add CGAL::cpp11::unordered_set/map using boost or std 2017-02-27 09:56:54 +01:00
Laurent Rineau a10de67473 Merge pull request #1888 from lrineau/CGAL_Core-fix_thread_local-GF
Followup for PR #1744
2017-02-13 18:19:15 +01:00
Sébastien Loriot 5212bb55a6 fix Core dependancies 2017-02-13 17:16:30 +01:00
Laurent Rineau 8ca29bc0ae Merge pull request #1888 from lrineau/CGAL_Core-fix_thread_local-GF
Followup for PR #1744
2017-02-09 18:42:11 +01: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 13e420732c Merge pull request #1840 from afabri/BGL-reserve-GF
BGL: Add helper function reserve(G,nv,ne,nf)
2017-02-08 17:32:22 +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
Laurent Rineau 760076510c Merge pull request #1845 from lrineau/Mesh_3-fix_detect_features-GF
Various modifications of Mesh_3
2017-02-06 15:19:31 +01:00
Laurent Rineau 4c3ea8908e Merge pull request #1875 from sloriot/PMP-rename_bbox_3
Rename bbox_3 functions
2017-02-06 15:19:18 +01:00
Laurent Rineau 28be8650d4 Merge pull request #1863 from afabri/T3-fix_link_to_face_graph_doc-GF
Triangulation_3: Fix the doc of link_to_face_graph()
2017-02-02 17:22:27 +01:00
Sébastien Loriot a675fa60e4 rename bbox_3 functions
free functions in CGAL have no dimension suffix
2017-01-31 14:33:56 +01:00
Andreas Fabri 7799ac8959 fix changes.html 2017-01-27 09:23:38 +01:00
Sébastien Loriot d1e777efaa rename file 2017-01-26 10:34:24 +01:00
Sébastien Loriot 2e098b58db remove duplicated entry 2017-01-26 09:58:50 +01:00
Andreas Fabri edbcde8a06 Update changes.html
Removing a deprecated class is not a breaking change.
2017-01-26 09:36:11 +01:00
Sébastien Loriot f06f7acf65 forgot to update the cmake script 2017-01-20 16:59:14 +01:00
Sébastien Loriot 11ee905650 remove useless test files 2017-01-20 16:32:59 +01:00
Sébastien Loriot 69e16f9c42 no longer use release_date.h 2017-01-19 16:33:19 +01:00
Sébastien Loriot eefa67f762 remove release_date.h and put the macro in version.h to be set by cmake
in the case of a release, it will be the date of the creation of the release
2017-01-19 16:32:31 +01:00
Sébastien Loriot 879d0c2cd8 update changes 2017-01-19 15:20:28 +01:00
Sébastien Loriot 06dbf4da5d license headers are LGPL 2017-01-19 15:20:27 +01:00
Sébastien Loriot a89ccb10e7 remove non UTF-8 characters 2017-01-19 15:20:26 +01:00
Sébastien Loriot 6405807260 generate license headers
using:
cd Installation/include/CGAL/license
cmake -P generate_files.cmake
2017-01-19 15:20:24 +01:00
Laurent Rineau 680210cab5 Improvements
- move `CGAL_WARNING` in `<CGAL/config.h>`,

- create the macro `CGAL_pragma_warning`,

- use `CGAL_pragma_warning` to simplify `<CGAL/license/lgpl.h>` and
  `<CGAL/license/gpl.h.in>`.

- add messages in `include/CGAL/license/generate_files.cmake`

- add test files, that do nothing but can be modified to check errors
  and warning.
2017-01-19 15:20:23 +01:00
Sébastien Loriot 57c662ea3b generate include/CGAL/license/package_list.txt
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo -n "$i "
  pn=`grep cgalPkgDescriptionBegin $i/doc/$i/PackageDescription.txt  | \
  sed 's/\\\cgalPkgDescriptionBegin{\s*//' | \
  awk -F "," '{print $1}'`; echo $pn;
done > Installation/include/CGAL/license/package_list.txt
2017-01-19 15:20:23 +01:00
Sébastien Loriot 281fcc52b5 fix header 2017-01-19 15:20:22 +01:00
Sébastien Loriot 1ef0791a15 license_check -> licence and lower case header 2017-01-19 15:20:22 +01:00
Laurent Rineau 53cac14b33 The new proposal, with a CMake script to generate header files
See Installation/include/CGAL/license_check/README.md
2017-01-19 15:19:47 +01:00