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

2322 Commits

Author SHA1 Message Date
Jane Tournois 990ace3c8a update changes.html 2015-11-05 20:09:14 +01:00
Jane Tournois f53bc373a0 update changes.html 2015-11-03 15:38:32 +01:00
Guillaume Damiand 7d9338c022 Update changes.html 2015-11-02 10:01:13 +01:00
Sebastien Loriot 2e493f297b Merge pull request #389 from afabri/CGAL-Qt3-GF 
Remove Qt3 based demos
 2015-10-23 17:08:49 +02:00
Clement Jamin f6a9afd028 Merge branch 'gsoc2014-2d-reconstruction-ivovigan-old' into gsoc2014-2d-reconstruction-ivovigan 2015-10-23 14:26:50 +02:00
Sebastien Loriot 31d06f2e92 Merge pull request #408 from afabri/PMP-keep_large_connected_components-GF 
Add keep_large_connected_components ()
 2015-10-22 09:06:33 +02:00
Andreas Fabri 29c794cd1a update changes.html 2015-10-22 09:04:07 +02:00
Sebastien Loriot 1dbac9df32 Merge pull request #400 from sgiraudot/Point_set_processing_3-IO_ply-GF 
Read and write PLY point clouds
 2015-10-22 08:56:10 +02:00
Sébastien Loriot 13ab0f221a update changes.html 2015-10-22 08:54:15 +02:00
Simon Giraudot ed6d09ffea Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-19 16:00:29 +02:00
Laurent Rineau 9e5487908b Merge pull request #350 from sakrist/master 
Changes for arm devices
 2015-10-19 15:05:48 +02:00
Simon Giraudot 99d4fc84bd Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-15 14:27:57 +02:00
Laurent Rineau 18cac48bae Merge pull request #367 from sgiraudot/Point_set_processing-hierarchical_clustering-sgiraudot 
New point set processing algorithm: Hierarchical clustering
 2015-10-14 10:54:37 +02:00
Laurent Rineau 853cb8d86e Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2015-10-14 10:51:03 +02:00
Laurent Rineau 330a0e75a2 Merge pull request #385 from cjamin/CGAL_headers_only-gdamiand_cjamin 
CGAL headers only, step 0
 2015-10-13 16:37:38 +02:00
Jane Tournois 1addaef720 write in changes.html 2015-10-13 15:44:59 +02:00
Sebastien Loriot 40da918aaf Merge pull request #368 from afabri/Spatial_searching-find_any_point-GF 
Add function Kd_tree::find_any_point(Query)
 2015-10-10 14:24:22 +02:00
Andreas Fabri e1ff955344 update changes.html 2015-10-10 14:18:08 +02:00
Sébastien Loriot e0019b175d add missing end tag 2015-10-10 14:05:49 +02:00
Volodymyr Boichentsov f06bea8d8d fixed boost endianness check 2015-10-09 09:26:00 +01:00
Simon Giraudot 7a0134fc55 Update changes.html 2015-10-08 08:59:29 +02:00
Volodymyr Boichentsov 64cceb7bb4 revert back arch's define check 2015-10-08 07:26:09 +01:00
Volodymyr Boichentsov ee8d3d7fa3 added endianness check with boost 
added few more arch's
added include for `<OpenGLES/ES2/gl.h>` header for ios
 2015-10-07 22:43:08 +01:00
Volodymyr Boichentsov 1518dad2de start change 2015-10-07 22:42:16 +01:00
Simon Giraudot 0a0737a863 Update changes.html 2015-10-07 16:02:24 +02:00
Sebastien Loriot 62644a62aa Merge pull request #318 from sgiraudot/CGAL-Solver-package-GF 
Regroup solver interface in Solver_package
 2015-10-07 15:54:48 +02:00
Laurent Rineau 3568c7813b Fix typos pointed out by Mael 2015-10-07 15:00:54 +02:00
Sébastien Loriot dfbba8ad06 Merge pull request #327 from sgiraudot/Point_set_processing_3-TBB-GF 
Point set processing parallelized with TBB
 2015-10-06 17:39:35 +02:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Andreas Fabri ca54af03c2 Use <mutex> starting with Visual 2012 and g++ 4.8 with std=c++11 2015-10-05 12:19:13 +02:00
Andreas Fabri 10cda5c00d update changes.html 2015-10-05 11:20:11 +02:00
Sébastien Loriot 3800004115 update changes 2015-10-05 10:36:53 +02:00
Andreas Fabri adf615c427 explain in changes.html and the installation pages when Boost.Thread is no longer used 2015-10-05 09:43:36 +02:00
Guillaume Damiand bd1de66629 Update CGAL_SetupBoost 2015-10-02 10:30:36 +02:00
Andreas Fabri 1331fc6c09 commnt message 2015-10-02 10:26:26 +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
Clement Jamin 31e8415983 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-10-01 14:51:09 +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
Guillaume Damiand e4342d50d2 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only-gdamiand_cjamin' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:48:54 +02:00
Andreas Fabri 3d4a1be429 WIP with Clement 2015-10-01 09:47:47 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Simon Giraudot ac591cf257 Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF 2015-09-29 13:50:17 +02:00
Sébastien Loriot da650cbd1c Merge branch 'old/CGAL-Solver-packages-GF' into CGAL-Solver-package-GF 2015-09-26 15:47:54 +02:00
Sebastien Loriot 81d65c9aa1 Merge pull request #349 from sgiraudot/Surface_mesh_parametrisation-OpenNL_Eigen-GF 
Surface mesh parametrisation - Replace OpenNL by Eigen as default
 2015-09-26 15:37:04 +02:00
Sebastien Loriot 8d3e06b7c4 Merge pull request #252 from bo0ts/Installation-remove_config_test-pmoeller 
Delete CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG.cpp
 2015-09-26 09:55:53 +02:00
Simon Giraudot 1b6643f334 Merge branch 'Point_set_processing_3-TBB-GF' of github.com:sgiraudot/cgal into Point_set_processing_3-TBB-GF 2015-09-24 12:46:33 +02:00
Simon Giraudot 13e4a76cd8 Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF 2015-09-24 12:45:58 +02:00
Sébastien Loriot 013316182d tips on how to update code 2015-09-24 07:30:04 +02:00
Laurent Rineau f1ebd105b5 Merge pull request #251 from bo0ts/Installation-fix_cmp_0054-pmoeller 
Make CMake code compatible with CMP0054
 2015-09-23 12:18:08 +02:00
Simon Giraudot 36723443a4 Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF 2015-09-23 10:29:14 +02:00
Sébastien Loriot b970fc80ef Merge branch 'old/Surface_reconstruction_points_3-Change_package_name-GF' into Surface_reconstruction_points_3-Change_package_name-GF 2015-09-22 09:54:18 +02:00
Sébastien Loriot 68aa21292a Merge branch 'old/CGAL-Solver-packages-GF' into CGAL-Solver-package-GF 2015-09-21 07:34:18 +02:00
Simon Giraudot c6f2cedafc Update changes.html 2015-09-18 15:36:27 +02:00
Laurent Rineau 1d89949b38 Prepare the comments for the changes of 4.8 2015-09-17 13:40:01 +02:00
Laurent Rineau 205f2adabb CGAL-4.7 will be published in October, not September 2015-09-17 13:03:23 +02:00
Laurent Rineau 2d5dd933e5 Reformat the changes.html/CHANGES 
I have:
  - rewrapped the paragraphs so they can be easily copy-pasted in a
    mail,
  - added <code></code> when needed,
  - and I did also minor fixes.
 2015-09-17 13:03:08 +02:00
Simon Giraudot 04f7fdc0c7 Update changes.html 2015-09-16 18:25:12 +02:00
Andreas Fabri 0d70d7b1ce do not write 'static' in the macro so that we can use the macro also for a definition 2015-09-14 10:17:22 +02:00
Andreas Fabri 4ba71bce35 fix for the single threaded case 2015-09-14 09:50:03 +02:00
Andreas Fabri ea612e9645 Improved macros to avoid #if #else where we want to use TLS 
The Residue.cpp file still needs simplification
 2015-09-11 18:01:51 +02:00
Andreas Fabri a14cf913e9 WIP: In Lazy.h we now have a single macro for boost and c++11 thread 2015-09-11 14:54:11 +02:00
Sébastien Loriot 470e96e75c document msvc2015 support 2015-09-11 10:42:57 +02:00
Andreas Fabri aa649eccc9 bug fix 2015-09-11 08:58:32 +02:00
Andreas Fabri 434e66a0f1 move detection of that the keyword threadlocal can be used from Mpzf.h to config.h 2015-09-10 12:44:52 +02:00
Simon Giraudot 687c7ba820 Update changes.html 2015-09-09 12:03:58 +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
Sébastien Loriot a31129f93d add layout for the 4.8 release including the "Surface Reconstruction" part 2015-09-07 10:19:12 +02:00
Andreas Fabri 220651bc88 Use CGAL_THREAD_LOCAL as thread_local only comes with VC201 2015-09-04 18:09:50 +02:00
Andreas Fabri bc5272495b For MSVC we no longer require boost thread and system 2015-09-04 11:50:54 +02:00
Andreas Fabri 52e5f3a521 Add a wrapper for the very basic mutex locking we make use of 2015-09-04 08:38:55 +02:00
Laurent Rineau a3187fd35e Merge pull request #285 from janetournois/CGAL-support_msvc2015-GF 
Initial support for MSVC 2015
 2015-08-27 16:34:29 +02:00
Laurent Rineau 3b5ff3f1ff Update changes.html and CHANGES. 2015-08-27 16:32:20 +02:00
Laurent Rineau 0fd6f2fa59 Merge pull request #288 from afabri/CGAL-add_hash-GF 
No longer forward declare struct std:hash

Fixes issues #287 and #274.
 2015-08-27 15:41:50 +02:00
Andreas Fabri bf975ead95 No longer forward declare struct std:hash 2015-08-23 14:30:54 +02:00
Laurent Rineau 5c2c3ca596 Update changes for 4.6.2 2015-08-20 12:10:48 +02:00
Monique Teillaud 48a728791e Update changes.html 
move misplaced entry for 4.5 (mesh3 -> triangulation3)
 2015-08-17 18:16:10 +02:00
Laurent Rineau ebe89cff22 Update the announcement mail 
- fix a typo: connnected
- re-wrap paragraphs
 2015-08-07 17:10:30 +02:00
Philipp Moeller 500812b520 Delete CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG.cpp 
The check is not used anywhere. The only place that could possibly use it is Installation/include/CGAL/internal/deprecation_warning.h which is already portable without the need for a configuration-time check.
 2015-08-05 15:12:25 +02:00
Philipp Möller dea9451c53 Move the add_config_flag macro to where it is used 2015-08-05 14:56:09 +02:00
Philipp Möller f0fad560f6 Remove unnecessary add_config_flag call 
This call to add_config_flag has no effect. It is made before the
file(WRITE ${CMAKE_BINARY_DIR}/include/CGAL/compiler_config.h ...) which
overwrites the contents of the file.

This is surely a bug, because ${CGAL_EXT_LIB_${lib}_PREFIX} expands to
things like GMP or MPFR which would be really bad defines.
 2015-08-05 14:56:09 +02:00
Philipp Möller e598d67ba6 CONFIG_CXX_FLAGS is no longer used 2015-08-05 14:56:09 +02:00
Philipp Möller de403e8cc4 Always run the config tests 
The code tried to prevent running the config tests to often by caching
their values and only rerunning them when the CMAKE_CXX_FLAGS change.

While this is smart it only buys us a few seconds and is not actually
correct. One of those bugs could be triggered through linker flags or
debug flags as well and just checking CMAKE_CXX_FLAGS is far from
enough. To be on the safe side we accept the extra
configuration-time (which is usually also minimized by using compiler
caches).

This also removes a warning caused by CMake policy CMP0054.
 2015-08-05 14:56:09 +02:00
Philipp Möller 8e5f887765 Prevent triggering of CMP0054 
CMAKE_CXX_COMPILER_ID can expand to the string MSVC, which is also a
variable name which has been expanded by before CMP0054 has been
introduced.

This would lead to a bug *if* we would MATCHES against the string "MSVC",
but only triggers a warning.

Also quote some implicit string in a MATCHES for style reasons.
 2015-08-05 14:56:08 +02:00
Philipp Möller 5cf0951577 Whitespace fixes 2015-08-05 14:56:08 +02:00
Philipp Möller 9b988404bf Set CMP0054 to NEW 
We set it to new by removing the code that sets it to OLD.
 2015-08-05 14:56:08 +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 928520b1bb Merge pull request #214 from lrineau/Installation-support_MSVC2015-GF 
Add support for VC14 (from MSVC 2015)
 2015-07-31 14:26:11 +02:00
Laurent Rineau d0bf3ecfd6 Merge pull request #211 from lrineau/Installation-disable_Qt3_by_default-GF 
Disable CGAL_Qt3 by default
 2015-07-30 18:00:07 +02:00
Laurent Rineau a25705527e Merge pull request #212 from lrineau/Installation-CMP0054_OLD-GF 
Remove the warning about CMP0054
 2015-07-30 17:58:02 +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 a6b6105a7f Remove the warning about CMP0054 
That is temporary.
 2015-07-29 15:44:21 +02:00
Laurent Rineau e72e89971d Bump SOVERSION to 11.0.1 (no change) 2015-07-29 15:33:16 +02:00
Laurent Rineau e4659d6a37 Disable CGAL_Qt3 by default 2015-07-29 14:21:07 +02:00
Laurent Rineau 8a0a14a051 Merge pull request #198 from aympelle/Fix_3D_PT_in_changes_html-APelle 
Fix changes.html
 2015-07-28 16:35:25 +02:00
Laurent Rineau d7c464ccc1 Fix changes.html 
"<version>" must be quoted.
 2015-07-28 16:27:53 +02:00
Aymeric PELLE 92eb77d3d0 Fix changes.html : 3D periodic triangulations changes were badly located. 2015-07-27 16:58:15 +02:00
Sébastien Loriot 4f593d5d96 add info on how to help cmake find qt5 2015-07-17 17:12:00 +02:00
Sébastien Loriot b43c8f4df6 remove comments 2015-07-17 17:04:32 +02:00
Laurent Rineau af341e4c23 Update requirement for Qt5: Debian-stable has 5.3.2 2015-07-17 16:05:12 +02:00
Laurent Rineau 5de30629bc Polish changes.html 2015-07-17 15:58:33 +02:00
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF 
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
 2015-07-17 15:39:18 +02:00
Sébastien Loriot 5d2c892dbe Merge pull request #149 'lrineau/Polygon_mesh_processing-GF' 
Add various functions to manipulate polygon meshes
 2015-07-17 14:50:56 +02:00
Sébastien Loriot 2668d83d4e Merge pull request #150 from 'cjamin/Point_set_shape_detection_3-cjamin' 
Add an algorithm to fit geometric primitives on a point set

Conflicts:
	Installation/changes.html
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-07-17 14:32:09 +02:00
Laurent Rineau aa72eaa371 Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF 
Qt5 support, GSoC 2014

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support

In this commit, I have fixed the permissions of the file:
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points

In this commit, I have also modified:
	Installation/changes.html
 2015-07-17 14:13:37 +02:00
Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF 
Conflicts:
	Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-07-16 16:52:53 +02:00
Andreas Fabri 5c58b6fe21 fix changes.html 2015-07-16 13:34:40 +02:00
Laurent Rineau a1c9ef62d1 Fix last CMake issues in test/Installation/ 2015-07-14 18:17:54 +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
Laurent Rineau 72104a5d29 Add link_to_CGAL_Qt5 2015-07-13 17:37:52 +02:00
Laurent Rineau 34ccb7facd Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller 
Add a CGALExports.cmake file

Conflicts:
	Installation/cmake/modules/CGALConfig_binary.cmake.in

This merge should fix the warning caused by CMP0024.
 2015-07-13 12:45:19 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Laurent Rineau 6506a35e7f It is CMake 2.8.11 that we want. 2015-07-13 12:21:54 +02:00
Sébastien Loriot c616df7196 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Installation/changes.html
 2015-07-13 08:16:59 +02:00
Laurent Rineau 0fb169701f Copy changes.html from master, to remove conflicts 2015-07-10 18:11:11 +02:00
Laurent Rineau f40fe0dc2d Merge branch 'gsoc2013-Visibility_doc-hemmer' into CGAL-Qt5_support-GF 2015-07-10 18:07:26 +02:00
Laurent Rineau fa13f4ed0c Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF 2015-07-10 17:28:07 +02:00
Laurent Rineau b043876c68 Merge pull request #147 from philaris/sdglinf-philaris 
L Infinity Segment Delaunay Graphs, new package

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Segment_Delaunay_graph_Linf_2
 2015-07-10 17:26:42 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Philipp Möller ed71d08e3d Do not include the CGALExport.cmake file while still building CGAL 
This rightfully triggers CMP0024, since the file created by export might
not exist at configure-time. We need to do some extra work to avoid
reading the LOCATION property from a non-imported target hence we
trigger policy CMP0026.
 2015-07-10 15:33:37 +02:00
Sébastien Loriot d70b65e431 Merge branch 'gsoc2013-Visibility_doc-hemmer' 
PR 145
 2015-07-10 15:25:39 +02:00
Laurent Rineau 518faece88 Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF 2015-07-10 14:04:03 +02:00
Laurent Rineau 9550a41b67 Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller 
Add a CGALExports.cmake file

Conflicts:
	GraphicsView/src/CGAL_Qt5/CMakeLists.txt
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in

There was also a conceptual conflict in:
	Installation/src/CMakeLists.txt
 2015-07-10 14:03:20 +02:00
Sébastien Loriot 47b7ac3c07 update script to find QGLviewer so that the environment variable is used first 2015-07-10 11:32:20 +02:00
Laurent Rineau 9ce70faffb Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt

There was also a "conceptual conflict" in:
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp
-> Adapt the declaration of the plugin to the Qt5 way.
 2015-07-09 18:04:09 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos 
Previous versions are not tested by the CGAL daily test suite.
 2015-07-09 17:50:22 +02:00
Sébastien Loriot e7563d3e05 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' 
Conflicts:
	Installation/changes.html
 2015-07-09 17:30:24 +02:00
Sebastien Loriot 43de56ba21 Merge pull request #167 from afabri/AvoidMergeConflicts 
Add place holders for the packages to be integrated
 2015-07-09 10:33:23 +02:00
Laurent Rineau bbd6951161 Merge branch 'afabri/Advancing_front_surface_reconstruction-afabri' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp

There was also two "conceptual conflicts" that git-merge did not see,
in:
        Polyhedron/demo/Polyhedron/CMakeLists.txt
        Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp

Polyhedron/demo/Polyhedron/CMakeLists.txt had to use qt5_wrap_ui instead
of qt4_wrap_ui (that lead to a CMake error), and the declaration of the plugin in
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
was not using the Qt5 way (that lead to a compilation error)
 2015-07-08 17:21:36 +02:00
Sébastien Loriot 0d431e39ab remove qt4 specific code 2015-07-07 18:00:43 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Sébastien Loriot 89184387d6 remove no longer needed QT4 cmake scripts 2015-07-07 18:00:43 +02:00
Andreas Fabri 0401e17fc0 move to place holder 2015-07-07 16:46:32 +02:00
Andreas Fabri b2914e78d7 add empty line 2015-07-07 16:18:16 +02:00
Andreas Fabri 49ba9e48bb add empty line 2015-07-07 16:13:06 +02:00
Andreas Fabri 7e041bcc50 move to place holder 2015-07-07 15:58:58 +02:00
Andreas Fabri 3c3fb9b0bb move to place holder 2015-07-07 15:23:55 +02:00
Andreas Fabri c09f7e86ef fix end of html comment 2015-07-07 14:59:36 +02:00
Andreas Fabri d26fdb17bf Add place holders for the packages to be integrated 2015-07-07 13:37:47 +02:00
Clement Jamin 3b8c24a4df Added the package 2015-07-07 12:06:46 +02:00
Laurent Rineau 49c2cdc19a Merge branch 'master' into sdglinf-philaris 
Conflicts:
	Installation/changes.html
 2015-07-06 18:33:08 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt 
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
 2015-07-06 18:14:34 +02:00
Laurent Rineau 99f8b0d80e Allow to find QGLViewer-qt5 on Windows too 2015-07-06 17:29:39 +02:00
Andreas Fabri e6ad9a82b3 Add a wrapper for the changes entry of sdglinf-philaris 2015-07-06 11:01:21 +02:00
Sébastien Loriot 05e0900b3e update changes.html 2015-07-06 10:38:41 +02:00
Marc Glisse 253ec38a0a Announce new functors for alpha-shapes 
As asked in the last comment of https://github.com/CGAL/cgal/pull/84
 2015-07-05 16:07:24 +02:00