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

469 Commits

Author SHA1 Message Date
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