songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
70,247 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

501 Commits

Author SHA1 Message Date
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
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
Guillaume Damiand c4758f091a Simplify CGALConfig files: we do not need anymore to find zlib, nor opengl. 2016-06-24 14:38:28 +02:00
Guillaume Damiand e21ef313c0 Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-22 20:54:37 +02:00
Guillaume Damiand 50125f1d53 First try to use an interface target in header only; in order to allow to link with this fictive target. 2016-06-22 13:44:50 +02:00
Guillaume Damiand f6428de32c include only .cmake file when they exist. 2016-06-21 19:08:06 +02:00
Guillaume Damiand 276c8271ab Remove a debug message 2016-06-21 12:27:44 +02:00
Guillaume Damiand 1f40288aa3 Update cmakes in order to deal with install version of CGAL in header only mode. 2016-06-21 11:20:28 +02:00
Sébastien Loriot 0b8115daff Make CGAL installation relocable 2016-06-16 11:11:46 +02:00
Clement Jamin b175d15421 Simplify test 2016-06-15 11:49:58 +02:00
Clément Jamin c1fe6fb342 Add TBB support for MSVC14 
TBB now supports MSVC 2015 (= VC14)

https://software.intel.com/en-us/articles/whats-new-intel-threading-building-blocks-44-update-1
 2016-06-15 11:03:58 +02:00
Clement Jamin 561bd80d96 On Windows, OPENGL_INCLUDE_DIR is empty even when OpenGL is found 2016-06-10 15:05:16 +02:00