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

543 Commits

Author SHA1 Message Date
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
Guillaume Damiand a53f16edac Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-09 19:09:38 +02:00
Guillaume Damiand b8d2782e39 Remove empty include directory directive. 2016-06-09 16:19:55 +02:00
Guillaume Damiand a5e04dcfd0 Update cmakes to deal with ZLIB in header only mode. 2016-06-09 15:39:56 +02:00
Sébastien Loriot 3cf08a5949 Set Eigen3 use file name in CGAL common 
ensure the use file is known even if the FindEigen3.cmake
shipped with Eigen is used
 2016-06-06 14:07:23 +02:00
Guillaume Damiand 89edc17cb1 Add quit to find_package; and improve error message for Qt5 2016-06-03 09:25:54 +02:00
Guillaume Damiand b507b12d4f Do not add in link_libraries in header only mode. 2016-06-01 19:18:43 +02:00
Maxime Gimeno fc992ed0c3 Replace the string(REPLACE vc...) by a single string(REGEX REPLACE ...). 2016-06-01 09:59:27 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Laurent Rineau a96ec65c54 Sort results of file(GLOB ...) to make build deterministic 
Patch from Joachim Reichel <reichel@debian.org>, adapted from the flat
layout to the Git layout.

Fix #1048.
 2016-05-06 16:50:16 +02:00
Laurent Rineau 71d91f9b99 Merge pull request #835 from bo0ts/patch-1 
Require correct Boost version through CMake
 2016-03-24 11:31:38 +01:00
Laurent Rineau 5b48eedf20 Merge pull request #790 from bo0ts/Installation-remove_ALL_PRECONFIGURED-pmoeller 
Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT and associated code
 2016-03-24 11:30:14 +01:00
Clement Jamin 1526a93a31 CGAL_AUTO_LINK_ENABLED is also used for Boost & co 
So we need it even in header-only mode.
CGAL auto-link is already disabled in auto_link.h so it's not a problem.
 2016-03-11 09:47:59 +01:00
Laurent Rineau 31d416df4e Fixes the PR #788 
With the split of `CGALConfig.cmake` into several files, one for each
lib, then the variable `CGAL_ImageIO_USE_ZLIB` was no longer stored in
`CGALConfig.cmake`.

That led to a full blue line in the testsuite:
  https://cgal.geometryfactory.com/CGAL/Members/testsuite/results-4.8-Ic-155.shtml#Mesh_3_Examples
 2016-03-10 11:56:55 +01:00
Laurent Rineau 3536c89d70 Fix CGALConfig.cmake header-only 2016-03-09 18:53:59 +01:00
Guillaume Damiand bcd3b6cde3 Remove unused variable 2016-03-09 17:31:24 +01:00
Laurent Rineau fd42bc1d15 Step 2 
CGAL_ImageIO and CGAL_Qt5 are not even configured in header-only
mode. They will be configured later by `CGALConfig.cmake`.
 2016-03-09 17:14:04 +01:00
Guillaume Damiand 24b156e3c6 Add cgal header only also in CGALConfig_install.cmake.in 2016-03-09 16:38:54 +01:00
Guillaume Damiand b9d209ee62 Search required third party library in find component macro. 2016-03-09 12:41:42 +01:00
Guillaume Damiand 94f2565c6a Replace the name of the variable to enable header only mode in CGAL_HEADERS_ONLY 2016-03-09 10:56:11 +01:00
Guillaume Damiand 0f0aa9f764 Remove the find_package qt5 do in CGAL_Macros.cmake which is now done in CGALConfig_binary.cmake.in 2016-03-09 10:50:53 +01:00
Guillaume Damiand dff63d83d3 Correct the problem of cmake qt5 macro not available in header only when configuring cgal_qt5. 
To solve this problem, we added in the macro check_cgal_component the find package of qt5 if we are configuring cgal_qt5.
 2016-03-09 10:44:15 +01:00
Guillaume Damiand 38ca4dd5e0 Bugfix in check_cgal_component for its first call. 2016-03-09 10:42:46 +01:00
Guillaume Damiand 561b1f2a38 Do not need cgal_include_moc_files macro 2016-03-09 10:37:58 +01:00
Guillaume Damiand 16a19eb33e Ok for demo for aabbtree 2016-03-09 10:37:57 +01:00
Guillaume Damiand 78cde742ce Work on demo with qt5; ok for AABBtree (but need to be improved) 2016-03-09 10:35:22 +01:00
Guillaume Damiand d56092753a Make enable_header_only option persistent 2016-03-09 10:35:21 +01:00
Clement Jamin c7d3a58688 Do not set CGAL_AUTO_LINK_ENABLED to TRUE in header only mode 2016-03-09 10:31:17 +01:00
Sébastien Loriot a3ba66c458 include export and lib config files on demand 2016-03-04 12:05:25 +01:00
Philipp Moeller e261b3ad4f Require correct Boost version through CMake 
This catches errors early and provides a clear error message instead of waiting for something in a test or example to break.
 2016-02-26 17:52:36 +01:00
Philipp Möller 9e7423fba6 Add missing _LIBRARY to variable on MSVC 2016-02-18 15:01:37 +01:00
Philipp Möller 0a685e82b3 Remove CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT from Macros 
This is the only place that uses the option. Because the code was
wrongly indented (several ifs missing a level) the removal looks
horrible.
 2016-02-16 17:21:23 +01:00
Philipp Möller ecb34b3031 Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT 
Do not add it to Config.cmake files anymore and remove it from the
interface
 2016-02-16 17:20:22 +01:00
Philipp Möller 732d6ccb96 Generate a config file for each lib 2016-02-16 17:02:56 +01:00
Philipp Möller 1aa334ff34 Remove unnecessary variable 
Never used anywhere and does not work with out-of-source builds
anyway...
 2016-02-16 17:02:56 +01:00
Philipp Möller 4211a4f01e Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 
This is a Cmake 2.4.3 variable that isn't even documented anymore.
 2016-02-16 17:02:55 +01:00
Philipp Möller c3fba6c5ab Remove unnecessary variable 
Correct name would be CMAKE_COLOR_MAKEFILE and default is ON anyway.
 2016-02-11 15:58:14 +01:00
Sebastien Loriot 2b49997c7e Merge pull request #493 from afabri/CGLAL-thread_local_storage-GF 
Remove boost thread dependency
 2016-01-04 16:49:26 +01:00
Simon Giraudot c2003e8a2a Add test for c++1z and gnu++XX flags 2015-12-17 10:18:20 +01:00
Sebastien Loriot b5546cb802 Merge pull request #486 from lrineau/Installation-visual_leak_detector-lrineau 
Enable the use of Visual Leak Detector in CGAL
 2015-11-26 14:30:14 +01:00
Sébastien Loriot e997e68582 missing c++98 2015-11-23 10:23:57 +01:00
Sébastien Loriot 260a501941 support more g++ version and enhance doc 2015-11-23 10:21:21 +01:00
Sébastien Loriot d1489cd7e0 fix and simplify when boost libs are needed 2015-11-20 14:30:34 +01:00
Sébastien Loriot 86a2225a0c boost thread not needed if using gcc 4.8 or greater in c++1[1/4] mode 2015-11-19 18:55:42 +01:00
Andreas Fabri 6b2c4dd7c6 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-11-09 14:26:42 +01:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Guillaume Damiand bd1de66629 Update CGAL_SetupBoost 2015-10-02 10:30:36 +02:00
Andreas Fabri d7c7747927 fix for non VC++ 2015-10-02 10:23:27 +02:00
Andreas Fabri 833bd5c49c no Qt3 in the installation manual 2015-10-01 14:52:05 +02:00
Andreas Fabri 47a41ccab0 cleanup 2015-10-01 12:38:55 +02:00
Andreas Fabri 1a4faa8575 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-10-01 10:03:04 +02:00
Jane Tournois 24666eb13e deal with msvc12 and msvc14 
until now, msvc14 is not supported by tbb (<= 4.4)
this commit prevents the testsuite from looking for it
 2015-09-08 10:21:55 +02:00
Andreas Fabri bc5272495b For MSVC we no longer require boost thread and system 2015-09-04 11:50:54 +02:00
Laurent Rineau 714fc9092b Remove an unused file 
This file was unused for six years:

	cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake

I remove it.
 2015-08-03 15:00:18 +02:00
Laurent Rineau f3d55fcb63 Add support for VC14 (from MSVC 2015) 
There was eventually no VC13.

- In cmake/modules/CGAL_GeneratorSpecificSettings.cmake replace it by
  MSVC14. Add a support for a futur MSVC15.

- Synchronize include/CGAL/auto_link/auto_link.h from the future
  Boost-1.59 (not yet released), to add support for VC14/MSVC2015.
 2015-07-30 11:28:13 +02:00
Laurent Rineau e43b1e42ba Do include the export file if CMP0024 does not exist 
With CMake-2.8.11, CMP0024 does not yet exist, and the target aliasing
feature does not exist either. So the only solution is to include the
export file.
 2015-07-14 16:06:53 +02:00
Laurent Rineau 877634ba9f Avoid multiple definitions of the target aliases 
With -DWITH_demos:BOOL=TRUE, the CGALConfig.cmake is included multiple
times. This patch avoids that one tries to define multiple times the
same target aliases.
 2015-07-14 15:59:56 +02:00
Laurent Rineau 3262264cbd Search dependencies quietly 2015-07-14 15:12:47 +02:00
Laurent Rineau fb4975f469 Check if the libraries are actually defined 
In CGALConfig.cmake, the former code was just checking if
WITH_${CGAL_LIB} was TRUE. Now, the new code also checks if the target
was actually defined. If the target is not defined by WITH_${CGAL_LIB}
is ON, if probably means that one dependency of the library was not
properly configured.
 2015-07-14 15:12:47 +02:00