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

2434 Commits

Author SHA1 Message Date
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
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 c27d1d8c6f Public keywork for target link libraries does not work on my system. 2016-06-24 14:37:22 +02:00
Sébastien Loriot c951fe0fca Merge pull request #1035 from lrineau/CGAL-fix_Wconversion_warnings-GF 
Fix -Wconversion warnings, and issues detected by those warnings
 2016-06-24 13:30:48 +02:00
Guillaume Damiand 98a5d85811 Patch to link 3rd party libraries with CGAL in header only mode (thanks @lrineau) 2016-06-24 09:58:16 +02:00
Guillaume Damiand d64f43ac73 The option CGAL_HEADER_ONLY is enabled only for cmake >= 3.0 (because in this case we use INTERFACE library) 2016-06-24 09:56:11 +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
Sebastien Loriot 3d8d50fa47 Merge pull request #1183 from sloriot/CMake-Install_relocable 
Make CGAL installation relocable
 2016-06-22 13:16:33 +02:00
Sébastien Loriot 79ad1b2dc6 Merge pull request #1141 from janetournois/PMP-isotropic_remeshing_smoothing_options-jtournois 
PMP isotropic_remeshing : smoothing options
 2016-06-22 11:46:05 +02:00
Guillaume Damiand f6428de32c include only .cmake file when they exist. 2016-06-21 19:08:06 +02:00
Guillaume Damiand 7b49c34709 Remove the creation of empty file 2016-06-21 19:06:21 +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
Sebastien Loriot b13b098d3b Merge pull request #1066 from ws4u/Cone_spanners_2-new_package-UWS 
Cone spanners 2 new package uws
 2016-06-08 14:49:13 +02:00
Sebastien Loriot 0058e85c02 Merge pull request #1136 from sloriot/CGAL-Set_Eigen_use_file 
Set Eigen3 use file name in CGAL common
 2016-06-08 14:12:25 +02:00
Sebastien Loriot 1ebaebc6aa Merge pull request #1101 from maxGimeno/Enhance_triangulate_facets-GF 
Robustify triangulate facets
 2016-06-08 09:50:48 +02:00