Commit Graph

513 Commits

Author SHA1 Message Date
Laurent Rineau f6d87bc3a5 Merge pull request #2172 from Geopipe/usecgalspam
Flag to prevent blanking linking flags from being applied
2017-06-21 14:44:40 +02:00
Laurent Rineau c25e4997ef Fix the indentation 2017-06-15 17:38:34 +02:00
Thomas "elfprince13" Dickerson 0d13f433f7 flag to prevent blanking linking flags from being applied 2017-06-13 19:03:16 -04:00
Laurent Rineau b4f3d79b9b Make CTest build the targets 2017-06-09 16:50:06 +02:00
Laurent Rineau 4d6149647d <CGAL/CGAL_Ipelet_base.h> requires C++11, skip it
That header needs C++11 at least, and that does not play well with the
`check_headers` feature. So put it in the whitelist, so that it is not
tested along with the other headers.
2017-04-18 18:25:56 +02: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 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
Sébastien Loriot a89ccb10e7 remove non UTF-8 characters 2017-01-19 15:20:26 +01:00
Michel Zou 722e37c4d7 MPIR support 2016-12-23 22:32:32 +01:00
Laurent Rineau 204f9d080a Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch' 2016-12-05 12:19:36 +01:00
Laurent Rineau f99b898cdf Use LEDA linker flags 2016-12-02 10:57:18 +01:00
Laurent Rineau 205bc84874 Fix FindLEDA with clang 2016-11-30 10:40:04 +01:00
Laurent Rineau 5b3c44a3ef Merge pull request #1637 from sloriot/CGAL-fix_install_prefix
Add a hardcoded fall back for the installation prefix
2016-11-03 11:03:24 +01:00
Sébastien Loriot f674cc1cd1 add a hardcoded fall back for the installation prefix
in case of no common setting, the installation cannot be
relocated automatically
2016-10-31 15:52:11 +01:00
Laurent Rineau 2c4e047f58 Do not early exit if IPE_FULL_VERSION is not there
If `IPE_FULL_VERSION` is missing, that leads to a CMake error in
`CMakeLists.txt` files using it.
2016-10-25 11:17:10 +02:00
Laurent Rineau 0d5ddad5c3 Merge pull request #1534 from lrineau/CGAL-Allow_examples_to_use_cpp11_features-lrineau
Allow examples to use C++>=11 features
2016-10-17 10:03:05 +02:00
Laurent Rineau 54ce89f314 Merge pull request #1560 from lrineau/Installation-fix_CGAL_VERSION_issue_1559-lrineau
Fix CGAL_VERSION in CGALConfig.cmake
2016-10-17 10:01:11 +02:00
Laurent Rineau e5b441feaa Fix CGAL_VERSION in CGALConfig.cmake 2016-10-10 12:31:21 +02:00
Laurent Rineau 451577719c Merge pull request #1542 from lrineau/Installation-fix_CGAL_SetupBoostlrineau
try_run to detect the C++ version
2016-10-07 14:38:22 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau e8dede494e Avoir a CMake error
When the list `CMAKE_CXX_COMPILE_FEATURES` is empty, there was a syntax
error.
```
CMake Error at /mnt/testsuite/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake:27 (list):
  list sub-command REMOVE_ITEM requires two or more arguments.
Call Stack (most recent call first):
  CMakeLists.txt:75 (create_single_source_cgal_program)

```
2016-10-05 10:07:01 +02:00
Laurent Rineau c1b070dd51 Use try_run to detect the C++ version 2016-10-04 16:57:19 +02:00
Laurent Rineau 87a2248ab6 Do no test demos
New directory property named `CGAL_NO_TESTING`. If set to `TRUE`, then
the automatic generating of CTest test will be disabled.

(cherry picked from commit 5d540fc1989c86438090b0212883b15cd121cf92)
2016-09-30 19:58:56 +02:00
Laurent Rineau 038207bc15 Fix CTest
I broke the support for .cmd files in 3d36fe05b3.
2016-09-30 19:46:58 +02:00
Laurent Rineau 50d753350e Allow examples to use C++>=11 features
The macro `create_single_source_cgal_program` from
`CGAL_CreateSingleSourceCGALProgram` has been modified accordingly.

(cherry picked from commit 571659aaa32a30d7bfc0ce54a9d29c56079dca06)
2016-09-30 18:42:46 +02:00
Laurent Rineau bc03fae86c Add a whitelist
For now, `<CGAL/Linear_cell_complex_constructors.h>` is skipped.
2016-09-30 15:23:15 +02:00
Laurent Rineau 367da380f1 Move and regenerate list_of_documented_headers.cmake 2016-09-30 15:23:15 +02:00
Laurent Rineau 67e9da4770 FindIPE defines IPE_VERSION 2016-09-30 15:23:14 +02:00
Laurent Rineau b700a3f4da Fix a bug in the deps detection 2016-09-30 15:23:14 +02:00
Laurent Rineau ceb6961594 Remove a debug message 2016-09-30 15:22:28 +02:00
Laurent Rineau ed680537c9 WIP: compute packages dependencies, using the compiler 2016-09-30 15:22: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
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 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
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 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
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 1cde972cdb Remove whitespace at end of lines 2016-06-29 11:04:29 +02:00