Commit Graph

2457 Commits

Author SHA1 Message Date
Maxime Gimeno c013d9d292 Clean-up
- Replace Mesh by TriangleMesh
- update changes.html and doc sections
- remove useless .off in examples
2016-09-28 10:48:07 +02:00
Maxime Gimeno 2912b9d40b Fixes in the doc 2016-09-28 10:46:42 +02:00
Maxime Gimeno a683fdca47 changes.html update 2016-09-28 10:46:40 +02:00
Laurent Rineau a90a921aff Merge pull request #1420 from afabri/Box_intersection_d-static-GF
Box_intersection_d: Make variables thread local
2016-09-27 17:48:58 +02:00
Laurent Rineau 54782db38f Merge pull request #1476 from imiordanov/Triangulation_data_structure_2-insert_in_hole-IIordanov
Triangulation data structure 2 insert in hole i iordanov
2016-09-23 16:56: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
Andreas Fabri 9d36d33e46 Define and use CGAL_NO_ATOMIC 2016-09-22 15:41:53 +02:00
Iordan Iordanov 6e5953cd68 Added description to changes.html 2016-09-21 10:40:32 +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
Laurent Rineau 0f1999f1bf Add a test that will fail
With the `WILL_FAIL` property, ctest will make the test success
if it fails.

The `cgal_test` script will not run it, because the file
`will_fail.cpp` does not contain a `main` function.
2016-09-20 10:53:20 +02:00
Laurent Rineau 37e138b252 CTest in branch builds 2016-09-20 10:53:20 +02:00
Laurent Rineau 269feff7e1 Handle .cin files correctly, with a CMake script in process mode
Handle also multi-line `.cmd` files.
2016-09-20 10:53:20 +02:00
Laurent Rineau 48caa236f6 Prepare changes.html for 4.10 2016-09-19 17:56:59 +02:00
Sébastien Loriot da84b03941 better handling with cmake 3.4 and greater 2016-09-13 16:38:07 +02:00
Sébastien Loriot ca8cfba5ad -ansi implies c++98 -> update script requirements of boost libraries 2016-09-13 14:22:49 +02:00
Thiago M. de C. Marques 6cfa204b29 Fixes the version compatibility to `SameMajorVersion`
See: https://github.com/CGAL/cgal/pull/1443#discussion-diff-78162752
2016-09-09 08:32:30 -03:00
Thiago M. de C. Marques 9c338ad61a Removes the copy of the package version file to the build config folder
See: https://github.com/CGAL/cgal/pull/1443#discussion-diff-78147435
2016-09-09 08:32:21 -03:00
Thiago M. de C. Marques a24dd7dd1c Adds CMake package version file generation
This allows clients to specify a minimum CGAL version in their CMake list files.
Eg.:

    find_package(CGAL 4.9)

More info: https://cmake.org/cmake/help/v3.6/manual/cmake-packages.7.html#package-version-file
2016-09-08 21:14:20 -03:00
Laurent Rineau 1c16ae9a52 Merge pull request #1309 from lrineau/CGAL-fix_HEADER_ONLY-lrineau
Hack to fix a bug with CGAL_HEADER_ONLY
2016-07-28 16:44:58 +02:00
Laurent Rineau acf339d27f Hack to fix a bug with CGAL_HEADER_ONLY
If a `CMakeCache.txt ` is first created without `CGAL_HEADER_ONLY`, and
then `CGAL_HEADER_ONLY` is set, then CMake displays error messages like:
```
CMake Error: Target CGAL has dependency information when it shouldn't.
Your cache is probably stale. Please remove the entry
  CGAL_LIB_DEPENDS
from the cache.
```

The problem comes from the fact that the target `CGAL` was first created as
a library target, and then turned into an "interface library" target.

This patch fixes the error the simplest way: remove the aforementioned
variable from the cache if it is present.
2016-07-28 16:40:04 +02:00
Laurent Rineau b9465c31ec Fix the indentation 2016-07-28 16:33:41 +02:00
Laurent Rineau 4a8602b49e Set CMP0056 if CMake>=3.2 2016-07-27 16:26:55 +02:00
Laurent Rineau 1ec30bd830 Merge branch 'releases/CGAL-4.8-branch'
This merge imports:
> Merge pull request #1304 from sloriot/Installation-remove_config_test
2016-07-27 16:18:33 +02:00
Laurent Rineau f96b186445 prepare 4.9-alpha1 2016-07-26 12:33:39 +02:00
Sébastien Loriot 98121af143 replace library compile time test 2016-07-26 11:58:03 +02:00
Laurent Rineau 890e1e0acb Merge pull request #1293 from sloriot/Combinatorial_map-remove_deprecated_api
remove old API deprecated since CGAL 4.4
2016-07-25 10:36:52 +02:00
Laurent Rineau 2cd9a15bb9 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch'
Merge the following merge commits:
> 12b92f5 Merge pull request #1271 from lrineau/Mesh_3-distance_criterion_sizing_field-GF
> 9c3d0b0 Merge pull request #1295 from lrineau/CGAL-add_test-GF

Conflicts:
	Maintenance/release_building/BUGFIX_NUMBER
	Maintenance/release_building/public_release_name
2016-07-22 18:31:02 +02:00
Laurent Rineau 3ff72add4a Add a comment with a TODO 2016-07-21 16:34:42 +02:00
Laurent Rineau 1da7e81b55 Add the project name to the LABELS property 2016-07-21 15:44:30 +02:00
Laurent Rineau c65d3abe17 Add support for CTest 2016-07-21 14:42:35 +02:00
Sébastien Loriot 3721536402 update changes 2016-07-21 13:53:26 +02:00
Laurent Rineau b2c9d14937 Merge pull request #1178 from cjamin/patch-2
Add TBB support for MSVC14
2016-07-20 18:08:27 +02:00
Laurent Rineau 5ebfefe72c Merge pull request #894 from gdamiand/CGAL_headers_only_step1-gdamiand_cjamin
CGAL header-only: step 1

(I actually do this merge for the Github interface for mobile phones! How much does that add to my geek-value?)
2016-07-05 19:50:36 +02:00
Sebastien Loriot 2d0e402e5b Merge pull request #1195 from sloriot/SMD-add_sre_arap
Add Smoothed Rotation Enhanced As-Rigid-As-Possible
2016-07-05 16:25:17 +02:00
Sébastien Loriot 99e36bfb0d update changes 2016-07-05 16:20:48 +02:00
Guillaume Damiand 46463202cb By default, CGAL_HEADER_ONLY is OFF. 2016-07-04 10:40:04 +02:00
Sébastien Loriot e3a44a9d75 remove the flag CGAL_USE_PROPERTY_MAPS_API_V1 and keep only new API 2016-07-04 10:17:38 +02:00
Clement Jamin 280036e488 Fix CGAL_DEPRECATED_UNUSED definition 2016-07-01 16:54:58 +02:00
Clement Jamin 3f130026bd Typos 2016-06-29 14:55:39 +02:00
Clement Jamin 7103bcf0e6 Add header-only in changes.html 2016-06-29 14:43:27 +02:00
Laurent Rineau 1cde972cdb Remove whitespace at end of lines 2016-06-29 11:04:29 +02:00
Guillaume Damiand 4165a5a312 Replace the test on policy 0043 by a test on the cmake major version. 2016-06-28 12:18:07 +02:00
Guillaume Damiand 7717bc83b4 ImageIo does not need opengl nor vtk 2016-06-28 11:29:51 +02:00
Guillaume Damiand 157f2507cf Re-add find_package(Qt5 QUIET COMPONENTS OpenGL Svg) and find_package(OpenGL QUIET) in CGALConfig; they are required in header only mode 2016-06-24 18:58:44 +02:00
Sébastien Loriot 10cadcb985 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD 2016-06-24 17:05:40 +02:00