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

905 Commits

Author SHA1 Message Date
Jane Tournois b5ace14604 fix the use of the cancel button 2014-11-28 12:57:42 +01:00
Jane Tournois a8440d8eaa Add a submenu to view only inside edges 
the edges that triangulate the convex hull outside of the
domain "pollute" the image
 2014-11-28 11:36:06 +01:00
Jane Tournois 361fc6e3d0 fix clear function when show seeds is on 2014-11-28 10:26:44 +01:00
Jane Tournois fbccaadd4f add using namespace 2014-11-27 12:28:37 +01:00
Jane Tournois 6cc4ccc524 fix display of constrained Voronoi diagram 
there is still a problem with voronoiPen
 2014-11-24 14:46:27 +01:00
Jane Tournois 45f96a803c fix display of seeds 
when "display seeds" is active, seeds are displayed right away
when a new seed is inserted
 2014-11-24 14:24:09 +01:00
Jane Tournois 4b56a4abdd remove useless cout 2014-11-24 12:16:29 +01:00
Jane Tournois b40b37c760 paint seeds fixed 2014-11-24 12:03:13 +01:00
Jane Tournois 600a9bb192 handling of in_domain changed 
the parity of the number of constraints crossed is not used anymore.
The infinite component is tagged outside.
About finite components, inside/outside status is only based on seeds,
 that should be inserted manually.
 2014-11-21 13:10:47 +01:00
Jane Tournois 5f687bdc39 abort meshing when "cancel" button is hit 2014-11-20 16:23:25 +01:00
Jane Tournois e4161ce685 handle seeds in lloyd_optimize_mesh_2 2014-11-20 16:13:46 +01:00
Jane Tournois 6897360695 handle the insertion of seeds inside the demo 
note after Lloyd, they are not taken into account yet to update
 the "inside" markers
 2014-11-20 14:57:17 +01:00
Jane Tournois c97c1c844b add a pen for seeds 2014-11-20 11:10:25 +01:00
Jane Tournois d463490202 drawing seeds works but points are too small 
todo : do not color faces corresponding to seeded zones
 2014-11-18 17:38:09 +01:00
Jane Tournois 56d4fe9732 insert seeds inside the demo 
drawing those seeds does not work yet, but meshing takes them into account
 2014-11-18 17:32:19 +01:00
Jane Tournois 4b71328474 change vertex base in demo to use my last commit 2014-11-14 13:40:30 +01:00
Guillaume Damiand a4c39c813f Inline for test_FPU_rounding_mode.cpp. 
There is const static variable, transformed into a static variable of a global function. This is not a problem since this is only used in debug mode to test the rounding mode at the end of the program. Testing it several times is ok.
 2014-11-14 10:45:42 +01:00
Jane Tournois 5e2fab9a51 add verbose stuff 2014-11-12 16:52:49 +01:00
Jane Tournois 76c8e95389 add input dialogs to demo to be able to set Delaunay refinement parameters 
k-Lipschitz case
 2014-11-12 16:26:44 +01:00
Jane Tournois f084954892 add input dialogs to demo to be able to set Delaunay refinement parameters 2014-11-12 16:16:03 +01:00
Jane Tournois e02773efd1 move files about sizing, and change template parameter. Geom_traits is enough 2014-11-12 15:42:27 +01:00
Jane Tournois e971112c1c this file should remain in the demo folder 2014-11-12 13:07:02 +01:00
Jane Tournois d071e71773 move demo "include" code to Mesh_2 "include" code. These files are needed for Lloyd 2014-11-12 12:51:09 +01:00
Andreas Fabri 0f92048c4d changes after Efi's review (and color changes in the demo) 2014-11-10 18:00:02 +01:00
Jane Tournois 5666a7db17 add code for Lloyd optimization, and in the demo 2014-11-07 17:07:14 +01:00
Laurent Rineau 29904d2f56 Other example with the Polygon demo 2014-11-07 17:06:41 +01:00
Laurent Rineau 9889f95768 Example of using of exportSVG 2014-11-07 16:57:28 +01:00
Laurent Rineau a35858a293 Move exportSVG to the DemosMainWindow base class 2014-11-07 16:57:04 +01:00
Laurent Rineau 94803a6a96 Implement export to SVG for the CDT_2 demo 2014-11-07 16:09:09 +01:00
Jane Tournois 1e1d6b9004 add menu to tag blind faces 2014-11-06 16:03:41 +01:00
Jane Tournois a4c3691763 add code to demo to display bad facets 2014-11-06 15:34:48 +01:00
Guillaume Damiand a7d968f88e Add missing impl files. 2014-10-31 19:31:37 +01:00
Guillaume Damiand 941824738e Header files for GraphicsView 2014-10-31 19:20:18 +01:00
Jane Tournois 4cf43198e2 dual(v) returns an OutputIterator that collects rays and segments 
to do so, use the Dispatch_output_iterator

- Constrained Voronoi diagram is now a class that has a pointer to a CDT
as member. We don't need an extra CDT anymore
- update examples
- also update the CDT 2 demo to see Voronoi cells, that are only valid when the
triangulation is Delaunay (constrained or not)
 2014-10-07 15:03:41 +02:00
Aurélien Vialon df9e315536 Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake. 2014-08-15 02:57:48 +02:00
Aurélien Vialon 7a0e8f545d Bugs correction about STREQUAL into findQt5. 2014-08-05 10:05:15 -07:00
Aurélien Vialon 6df9530094 All GraphicView demonstrations ported to the new Qt inclusion way. 
Change of Qt4or5 variables names.

Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
     USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
     QT_VERSION_USED => number of Qt version wanted (4 or 5).
     QT4 => TRUE if Qt4 chosen.
     QT5 => TRUE if Qt5 chosen.
 2014-08-05 18:13:39 +02:00
Aurélien Vialon 0a457c4b03 Correction of some bug caused by the new find_package way of Qt (Qt4or5) with the Qt4 support. 2014-08-02 14:59:49 -07:00
Aurélien Vialon 46c8926854 New way to chose Qt version for projects configuration. 
Now, we have choice between "WITH_CGAL_Qt4" and "WITH_CGAL_Qt5" (like before because differents CGAL_QtX sources folders return).

Once the libCGALQt4 or libCGALQt5 configured, an cmake config variable "CGAL_QT_RECENT" allow us to know what is the more recent libCGAL_QtX configured.

Automaticaly,the demonstrations chose this recent version of Qt to build their project (even if a Qt version choice is proposed during CMake configuration)

During CMake configuration, when the user change the version of libCGAL_QtX, that change automaticaly the Qt version of find_package(QtX)

Now Qt4or5 is the thing allowing the choice between Qt4 and Qt5 (find_package(CGAL COMPONENT Qt4or5) or find_package(Qt4or5))
 2014-08-02 01:37:41 +02:00
Aurélien Vialon 6784800dd1 Fusion of CGAL_Qt4 and CGAL_Qt5 into just one CGAL_Qt. 2014-07-31 22:41:44 +02:00
Aurelien Vialon 548bba0637 Mesh_3_export_plugin Windows modification. 2014-07-17 19:16:18 +02:00
Aurelien Vialon 4c85bee791 Add of Apollonius_graph_2 demonstration of GraphicView and all GraphicView demonstrations works on Windows. 2014-07-17 13:03:23 +02:00
Aurelien Vialon c3aaf0bffe Some modification of CGAL Graphic view to a better compatibility of Windows with the Qt5 version of CGAL (especially about dll import and export stuff). 2014-07-17 01:55:07 +02:00
Aurélien Vialon 520e791a99 GraphicView demonstrations porting. 2014-07-09 16:31:29 +02:00
Laurent Rineau 59d3dd8793 Do not require GMP explicitly 2014-07-02 12:58:50 +02:00
Aurélien Vialon aee9e4eb24 Commit of new demonstrations porting. 2014-06-26 14:38:23 +02:00
Aurélien Vialon 08685b683e Merge branch 'gsoc2014-CGAL-Qt5_support-vialon' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2014-CGAL-Qt5_support-vialon 
Conflicts:
	GraphicsView/src/CGAL_Qt5/CMakeLists.txt
	GraphicsView/src/CGAL_Qt5/resources.cpp
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
 2014-06-02 00:55:05 +02:00
Aurélien Vialon 5f09ccde1a Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3. 2014-06-01 22:46:14 +02:00
Aurélien Vialon 1f669ad498 Update Support for Qt5 project. 2014-05-29 12:07:42 +02:00
Laurent Rineau 685dffc636 Fix PolylinesGraphicsItem 
Bug reported on cgal-discuss:

  From: Bernhard Kornberger
  To:   cgal-discuss@inria.fr
  Date: 2014/03/25 Tue 11:30
 2014-04-01 16:30:37 +02:00
Laurent Rineau 90936d8e30 Fix a warning 
demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h:348: warning: passing `double' for converting 1 of `void QPainter::drawRect(int, int, int, int)'
 2014-03-11 18:23:11 +01:00
Laurent Rineau 2c1f436ed4 Fix another compilation error 2014-03-11 18:18:55 +01:00
Laurent Rineau e50a1c6374 Fix a warning 2014-03-06 17:03:47 +01:00
Laurent Rineau 1910e7151e Fix a compilation error on Windows 
The min/max macro issue.
 2014-03-06 17:03:28 +01:00
Laurent Rineau aaa5e020d4 Rename Periodic_2_triangulation_2.cpp to the name of the target 
Rename Periodic_2_triangulation_2.cpp
Periodic_2_Delaunay_triangulation_2.cpp so that is named like the CMake
target. The default cgal_test script requires that. Before that
renaming, the Periodic_2_Delaunay_triangulation_2 demo was not compiled
by testsuites.
 2014-03-04 14:21:40 +01:00
Laurent Rineau 89ad21df97 Use a new CGAL logo 2014-02-25 18:11:31 +01:00
Sébastien Loriot a64b317ba7 trivial bugfix in cdt2 demo 
mark faces in the domain also when reading a polygon from a file
 2014-02-17 08:48:02 +01:00
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb 
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
 2014-02-10 14:54:23 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +01:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot b2ef3b8673 Merge branch 'doc-remove_gif-local' 
Successfully test in CGAL-4.3-Ic-102

This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.

Approved by the interim release manager

xplain why this merge is necessary,
 2013-07-26 17:50:07 +02:00
Sébastien Loriot 2dfe8a3d73 workaround for a doxygen bug: remove space after /!* to avoid a verbatim env 
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
 2013-07-25 14:58:53 +02:00
Sébastien Loriot 74a1ac055e remove pdf files from doxygen doc include path 2013-07-25 11:15:18 +02:00
Laurent Rineau 73887c6927 Revert "Revert the merge of Periodic_2 into master. It was pushed by error." 
This reverts commit b27c0a4efb.
 2013-06-28 17:48:15 +02:00
Laurent Rineau b27c0a4efb Revert the merge of Periodic_2 into master. It was pushed by error. 
Revert "Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal"

This reverts commit 5ac2c05249, reversing
changes made to 93b77ce529.
 2013-06-24 12:50:27 +02:00
Nico Kruithof a9858ee784 Merge branch 'Periodic_2_triangulation_2-nkruithof' 2013-06-11 21:22:30 +02:00
Ross Hemsley 4d9caf3763 Added names that were missing into the Doxyfile.in entries. 
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
 2013-05-30 17:55:43 +02:00
Philipp Möller d4e379ba82 Small fixes in the generated Doxyfile.in 2013-05-30 15:32:33 +02:00
Philipp Möller 4d469821f7 Generated Doxyfile.in and dependencies 2013-05-30 14:13:47 +02:00
Nico Kruithof 01778a2347 Merge branch 'master' into Periodic_2_triangulation_2-nkruithof 2013-04-01 06:41:20 +02:00
Nico Kruithof bb9a733bd1 Updated the P2T2 demo. 2013-03-31 19:50:37 +02:00
Nico Kruithof bc0a55ad1e Improved demo with Iterator_type-ed simplices 2013-03-31 14:58:49 +02:00
Laurent Rineau b6ffa7c425 Merge branch 'CGAL-fix_warnings-GF' 
That branch was successfully tested in CGAL-4.2-Ic-205.
 2013-03-27 12:23:31 +01:00
Nico Kruithof f5ba6b3ac0 Draw the bounding box around the middle cover if we have multiple covers 2013-03-26 15:07:44 +01:00
Nico Kruithof f26692677f Working on the demo, coloring the vertices of small triangulations 2013-03-24 09:19:52 +01:00
Andreas Fabri 0cbc8b0e40 remove unused parameters 2013-03-23 08:45:06 +01:00
Sébastien Loriot 3c7ad8410c add classified reference manual pages 2013-03-12 15:07:19 +01:00
Laurent Rineau 723b28d39f Fix warnings about incorrect type conversions 2013-03-05 12:44:11 +01:00
Andreas Fabri f09633f71d size_t -> int 2013-03-05 11:35:29 +01:00
Andreas Fabri cd45bc8126 std::size_t -> int 2013-03-04 12:02:53 +01:00
Andreas Fabri 6ac85b1b27 remove unused variable 2013-03-01 16:35:23 +01:00
Nico Kruithof 1442e12512 Fixing compiler warnings with strict CXXFLAGS 2013-03-01 08:06:59 +01:00
Nico Kruithof d1bb7d7bc8 remove debug log message 2013-02-28 20:40:36 +01:00
Andreas Fabri 84a7061b15 remove unused parameter name 2013-02-28 16:40:57 +01:00
Andreas Fabri a3eafddd16 virtual function of derived class must match the API of the base class 2013-02-26 07:35:51 +01:00
Laurent Rineau 2d8da664a3 Merge branch 'CGAL-fix_warnings-gdamiand' 
Conflicts:
	.gitignore
	Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
 2013-02-22 13:02:37 +01:00
Laurent Rineau 7f3045ee11 Remove the use of CGAL_SVN_REVISION 
src/CGAL_Qt4/DemosMainWindow.cpp was the sole user of the macro
CGAL_SVN_REVISIONS, in CGAL's master branch. That macro is useless since
the switch to Git.
 2013-02-21 15:26:03 +01:00
Laurent Rineau 26a7e70785 New license.txt files (eol changes) 
The new version 2.13.0 of licensecheck has changed the spaces at eol.
 2013-02-19 16:46:39 +01:00
Nico Kruithof e940cf20e0 Merge branch 'master' into Periodic_2_triangulation_2-nkruithof 
Conflicts:
	Documentation/doxyassist.xml
 2013-02-05 14:25:56 +01:00
Nico Kruithof c97a1a1fbb Worked on the dual functions 2013-02-05 14:07:12 +01:00
Andreas Fabri 61bb99e2f1 use types 2013-02-04 22:39:00 +01:00
Andreas Fabri ee5b4683d0 deal with Triangulation_3, Polyhedron,Voronoi, Minkowski_sum_3 2013-01-31 09:47:54 +01:00
Nico Kruithof b11bdb4513 moved circumcircle from triangulation to delaunay triangulation 2013-01-28 08:05:48 +01:00
Nico Kruithof 27b2fb7054 Locating a point within the periodic domain 
Using a hint for the face handle to speed up point location
Making sure that the chance is big that the face handle still exists
 2013-01-28 07:57:19 +01:00
Nico Kruithof b3e580c350 Implemented the Conflict zone in the demo 2013-01-26 22:08:54 +01:00
Nico Kruithof fa1b7493f0 Fixing locating points outside the periodic domain 2013-01-25 17:37:11 +01:00
Nico Kruithof b8babf5964 Adding conflict zone visuals to the single point insertion 2013-01-25 17:31:46 +01:00
Nico Kruithof 5487601ae1 Implemented the empty circumcircle button 2013-01-25 17:18:44 +01:00
Nico Kruithof ae5565d912 Working on the P2T2 demo 2013-01-24 21:16:54 +01:00
Nico Kruithof 05f7dbc322 Working on the demo, adding more icons to the toolbar 2013-01-24 20:21:01 +01:00
Nico Kruithof d23bb62118 Moved the Periodic demo to the graphicsview package. This makes it easier to find icons and other resources 2013-01-22 10:12:49 +01:00
Andreas Fabri 1ae5df0172 When reading a file with 2D points, read the x and y, and ignore the rest of the line. This implies 1 point per line. 2013-01-08 10:31:41 +01:00
Sébastien Loriot 7e095c7a7a Merge branch 'Documentation-flat-ref-manual-pmoeller' 2013-01-04 15:19:57 +01:00
Sébastien Loriot a109eb2d8a graphics View grouping 2013-01-04 10:54:52 +01:00
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01:00
Philipp Möller 75f69570dc Change the titles of mainpages to "User Manual" 
This leads to a slightly odd result in the search for "User Manual",
but makes the pages themselves more consistent.
 2012-12-13 14:47:09 +01:00
Philipp Möller 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +01:00
Efi Fogel acb7dcebbc Porting of the 2D Arrangements demo to Qt4 2012-11-29 11:14:01 +02:00
Sébastien Loriot 9576be3c3b add doc in dont_submit 2012-11-27 08:42:02 +01:00
Sébastien Loriot 920eb63882 backporting documentation changes of master@9fcc5b57 into doxy-port-pmoeller 
Conflicts:
	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
	Installation/doc_tex/Installation/usage.tex
	Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
	Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h
	Spatial_searching/doc/Spatial_searching/CGAL/Incremental_neighbor_search.h
	Spatial_searching/doc/Spatial_searching/CGAL/K_neighbor_search.h
	Spatial_searching/doc/Spatial_searching/CGAL/Orthogonal_incremental_neighbor_search.h
 2012-11-23 22:54:31 +01:00
Sébastien Loriot 88dd673c40 backport commit in tex file from master into doxygen 2012-11-23 17:06:47 +01:00
Andreas Fabri 625f9f6cd7 after git merge remotes/origin/hot-fixes-for-Git 2012-11-20 13:02:17 +01:00
Sébastien Loriot 8d741d504d remove % in section name 2012-11-14 16:10:15 +01:00
Sébastien Loriot 128b02abb8 update CGAL custom doxygen macros 
corresponds to a run of the script Documentation/conversion_tools/rename_macros.sh
+manual edit of doxyassist.xml and pkglist_filter.py
 2012-11-14 00:31:05 +01:00
Sébastien Loriot 5ee1081f92 using cgal macros for all figures 2012-11-08 17:17:29 +00:00
Sébastien Loriot ae159cbdf3 replace markup #, ##, ### by \section, \subsection and \subsubsection 
(script replacement)
 2012-11-06 22:02:15 +00:00
Efi Fogel 1e3833930c merged with next 2012-10-25 10:07:41 +00:00
Philipp Möller 31e9eadf8b Fix all PackageDescriptions to a newer layout 2012-10-19 15:52:31 +00:00
Laurent Rineau b7b4b5f43e s/qt.nokia.com/qt.digia.com/g 2012-10-08 08:02:37 +00:00
Andreas Fabri 59c77aec24 finished 2012-10-05 19:03:19 +00:00
Philipp Möller bc48dfe5a0 Be consistent about author/authors 2012-10-03 16:40:16 +00:00
Philipp Möller c9fdbf3edb Add an anchor to each level one heading, so we get a nice tree in the 
user manuals.
 2012-10-02 11:53:01 +00:00
Philipp Möller 37778547bf Fix example to point to paths similar to a flat layout 2012-10-01 18:02:44 +00:00
Laurent Rineau e3cb421cd2 Fix: allow the drap&drop of a collection of files, and open all of them... 
... instead of opening only the first one.
 2012-09-27 13:29:40 +00:00
Philipp Möller 9d96057636 Add PkgDependsOn to the package summary 2012-09-27 11:13:37 +00:00
Philipp Möller b64ba48134 The changes to move the package overview labels into the 
PackageDescription.
 2012-09-25 17:17:49 +00:00
Philipp Möller 1954eff3d6 * build normalized mainpage anchors 
* better naming for Pkg commands
* User and Reference Manual links from the PackageOverview
 2012-09-20 15:30:03 +00:00
Andreas Fabri 6f61e2b2ee Downsize headings 2012-09-17 14:53:05 +00:00
Philipp Möller 864aebe2e5 Merge next. 
This commit also updates the respective mock-headers when the
corresponding .tex documentation has changed. This has been the case for:

AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_features.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_no_features.tex
Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex
Number_types/doc_tex/NumberTypeSupport_ref/Lazy_exact_nt.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_2.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_3.tex
Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex
 2012-09-12 14:14:22 +00:00
Philipp Möller 5a0a5403c4 Enable autotoc on mainpages 2012-08-29 15:45:17 +00:00
Philipp Möller e2616dafb1 Rebuild the how_to_cite structure 2012-08-28 17:33:45 +00:00
Andreas Fabri a1724dfcc7 typo 2012-08-27 19:50:44 +00:00
Andreas Fabri 4bcb13f7a2 % to unlink 2012-08-27 12:20:04 +00:00
Philipp Möller 76aacb1add Change created package names to be the pretty printed version instead 
of the readable, short, easy-to-remember SVN version.
 2012-08-23 17:00:30 +00:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy 
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | Try to fix my last revision about cmake_policy, with CMake-2.6.x
  | 
  | CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
  | x.y.z is greater than the current CMake version.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
 2012-08-22 12:35:03 +00:00
Andreas Fabri af87732f6a Add \anchor of chapters 2012-08-21 10:18:58 +00:00
Philipp Möller d3a9a641de Refurb package descriptions with a label for the license. 2012-08-20 14:28:36 +00:00
Philipp Möller 6a45864c1a Throw a set of ported doc files under version control 2012-08-09 16:07:44 +00:00
Eric Berberich 5f524b0802 subdirectories in src finally get correct name 2012-08-03 17:21:30 +00:00
Alex Tsui f27e1c2c7f Circular_arc_traits example compiles and runs, but just barely. 
* Currently errors out on attempting to insert intersecting arcs.
 2012-08-02 21:00:08 +00:00
Laurent Rineau 8e167590c8 Use include_directories(SYSTEM ...) for 3rd-party libraries 
gcc has an option -isystem, that can replace -I. The documentation is:

 -isystem dir

     Search dir for header files, after all directories specified by -I but
     before the standard system directories. Mark it as a system directory,
     so that it gets the same special treatment as is applied to the
     standard system directories. If dir begins with "=", then the "=" will
     be replaced by the sysroot prefix; see --sysroot and -isysroot.


The "special treatment" means that gcc will not warn about constructions in
headers in directories pointed by -isystem instead of -I.

In the CGAL testsuite, there are a lot of warnings that comes from
third-party libraries (mostly from Boost, but also from Eigen).

This patch tells cmake to use -isystem with gcc, for all CGAL 3rd-party
directories.
 2012-08-01 10:53:37 +00:00
Laurent Rineau a7a89c25b7 add_dependencies( Polygon_2 ${CGAL_LIBRARY} ) is useless 
Ar the target Polygon_2 links with the CGAL library, CMake already creates
a dependency.
 2012-07-31 16:18:17 +00:00
Alex Tsui 09857e2e74 Used sfinae to use circular and non-circular kernels with Converter. 2012-07-30 21:03:25 +00:00
Ophir Setter 005904363f Taking the multiplicity from base class. This caused all 64-bit programs to crash 2012-07-06 07:13:42 +00:00
Laurent Rineau 4953bbbc86 Remove buggy executable bits 2012-07-04 19:28:22 +00:00
Eric Berberich bc6d9c1005 fixed typo: added missing '_' 2012-07-03 10:53:25 +00:00
Eric Berberich d4cb1c2212 SetupDependicies needs also to check for essential lib (not just WITH_<lib>), side effect: mandatory->essential 2012-06-29 15:24:30 +00:00
Laurent Rineau 947dd14f31 Minor fix: ensure the OpenGL version is displayed by test results pages 2012-06-29 10:57:59 +00:00
Eric Berberich b5a4e941fd the mandatory libs need an particular order, and we simplify with a macro 2012-06-29 09:24:19 +00:00
Laurent Rineau 70e00b3d6e First fix for Windows: the auto-linking needs link_directories commands 2012-06-28 15:32:04 +00:00
Eric Berberich eb6c435c4a correct spelling of GMPXX_FOUND variable 
FOUND_GMPXX -> GMPXX_FOUND
 2012-06-28 13:02:32 +00:00
Eric Berberich df72a1aa08 macro use_lib now has an optional second parameter for UseFile 
this avoids a nasty hack with checking for a leading ### in a string and 
allows to use "use_lib( FOO )" in other places much easier
 2012-06-28 12:20:52 +00:00
Eric Berberich 67291a2c6d merge from next 2012-06-24 12:17:32 +00:00
Philipp Möller ea6635c86d Include the header with the declaration so that the declaration with 
the attribute precedes the definition.
 2012-06-20 10:20:27 +00:00
Alex Tsui 7ba8b08c4d Implemented insertion and removal of segments to arrangements. 2012-06-15 05:28:38 +00:00
Eric Berberich b6e350ccfa removed old verbose output 2012-06-11 22:24:22 +00:00
Eric Berberich 463a030267 removed old verbose output 2012-06-11 22:23:28 +00:00
Laurent Rineau 7b2e34d267 merge with next 2012-01-27 16:46:42 +00:00
Laurent Rineau 2fbd163e14 Factorize the installation command of CGAL library into the macro 
The macro build_cgal_library(..) now defines the installation rules. That
should also fix a bug: now .dll files will be installed in
${CGAL_INSTALL_BIN_DIR}.
 2012-01-25 16:49:39 +00:00
Laurent Rineau 8b413cef28 Remove variables CGAL_<lib>_BASENAME: no longer used. 2012-01-25 16:37:06 +00:00
Eric Berberich 8b63cf18fd fixed spacing 2012-01-24 13:13:27 +00:00
Eric Berberich 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Andreas Fabri 792deb3819 Fix for Windows 'min/max' bug and remove superfluous #include 2012-01-19 08:43:49 +00:00
Andreas Fabri 0d56ed88dc Fix for Windows 'min/max' bug 2012-01-19 08:11:02 +00:00
Andreas Fabri 560246e34b Fix for Windows 'min/max' bug 2012-01-19 08:07:40 +00:00
Andreas Fabri 0a89e16d86 Fix for Windows 'min/max' bug 2012-01-19 08:00:17 +00:00
Andreas Fabri 77f3648287 Fix for Windows 'min/max' bug 2012-01-18 12:02:15 +00:00
Andreas Fabri 26ec45fee9 Fix for Windows 'min/max' bug 2012-01-18 11:27:10 +00:00
Andreas Fabri 844e7869fa Fix for Windows 'min/max' bug 2012-01-18 11:25:40 +00:00
Andreas Fabri 10d334d4a5 Fix for Windows 'min/max' bug 2012-01-18 11:21:11 +00:00
Andreas Fabri 73a21e0f47 Fix for Windows 'min/max' bug 2012-01-18 11:17:08 +00:00
Andreas Fabri ae3244e596 Fix for Windows 'min/max' bug 2012-01-18 11:15:52 +00:00
Andreas Fabri f880735fbf Fix for Windows 'min/max' bug 2012-01-18 11:14:44 +00:00
Sébastien Loriot f6784b96e7 merge from next 2012-01-17 13:47:33 +00:00
Laurent Rineau 29d617e712 Cosmetic change: add a space after the license, to be compatible 
with the output of licensecheck
 2012-01-16 15:56:10 +00:00
Laurent Rineau a37c74d534 Add license files, per package 2012-01-16 15:54:22 +00:00
Sébastien Loriot a7456a2736 merge from next 2012-01-16 15:28:51 +00:00
Sébastien Loriot fca9a7bf54 *add operator>> for Constrained_triangulation_2 
*update demo
*add save CDT for demo

see the related small feature:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_read_istream_for_constrained_triangulation.
 2012-01-16 13:32:05 +00:00
Laurent Rineau 79f41a6c2f Add a license header 2012-01-16 10:54:58 +00:00
Laurent Rineau 2af2160942 Turn \ccLicenseQPL into \ccLicenseGPL 2012-01-13 17:13:55 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Eric Berberich a42d72acaa CGAL_USE_GMPXX is only set by use_lib macro 2012-01-11 00:00:05 +00:00
Eric Berberich 00d31036ea build_cgal_library -> collect_cgal_library (new macro name) 2012-01-10 18:17:53 +00:00
Eric Berberich 10af9912d9 CGALcomponent libs are not own CMake projects anymore 2012-01-10 18:13:19 +00:00
Eric Berberich 9cd61d509c let QT compile 2012-01-10 12:31:59 +00:00
Eric Berberich 66bc1cef1e merge from next 2012-01-09 12:42:00 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Sébastien Loriot 8ae6131f2e opti 2011-12-30 15:11:21 +00:00
Sébastien Loriot c564dfe82a fix drawing of degenerate parabola segment (source, target and center are collinear) 2011-12-30 15:00:46 +00:00
Laurent Rineau 98eccea610 Patch so that Qt's MOC can parse our headers, with Boost-1.48 
UPDATE: fix the previous commit. I applied the patch stupidly.

  | The patch is adapted from this bug report:
  | 
  | From: Mark Brand < mabrand@mabrand.nl>
  | To: cgal-discuss@lists-sop.inria.fr
  | Subject: [cgal-discuss] [PATCH] prevent Qt's moc from choking on BOOST_JOIN
  | 
  | See https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
 2011-11-21 17:06:17 +00:00
Laurent Rineau f5ec3f260c Patch so that Qt's MOC can parse our headers, with Boost-1.48 
The patch is adapted from this bug report:

From: Mark Brand < mabrand@mabrand.nl>
To: cgal-discuss@lists-sop.inria.fr
Subject: [cgal-discuss] [PATCH] prevent Qt's moc from choking on BOOST_JOIN

See https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
 2011-11-21 16:42:18 +00:00
Laurent Rineau 93486787c3 The inside of ccPkgDescription must not contain black lines between macros 
Otherwise that inserts a buggy "<p>" tag in the package overview where the
doctype does not allow it.
 2011-11-15 19:16:23 +00:00
Olivier Devillers f5636aa2fa merge next 2011-11-04 12:57:12 +00:00
Laurent Rineau 6ed56d75b5 merge from next 2011-10-25 15:48:02 +00:00
Andreas Fabri c5c387f45e workaround to avoid an unjustified warning of g++ 2011-10-24 13:21:59 +00:00
Laurent Rineau 13447f666c auto-link files must include <CGAL/config.h> 
<CGAL/config.h> includes <CGAL/compiler_config.h>, that is generated during
the build of libraries. CGAL_BUILD_SHARED_LIBS is defined in it.
 2011-10-24 09:23:21 +00:00
Olivier Devillers c239517f42 remove warning 2011-10-24 07:55:45 +00:00
Laurent Rineau c37ce187ff Factorize the settings of VERSION/SOVERSION properties of libraries 2011-10-19 15:53:46 +00:00
Laurent Rineau 338c6a9925 Update the export feature to non-Microsoft compilers 
Support the ELF visibility feature of gcc/icl/clang
 2011-10-18 16:53:54 +00:00
Laurent Rineau 9059b29647 Fix and factorize post-build commands on Windows 
The function build_cgal_library defined in
Installation/src/CMakeLists.txt now handles a lot more than before, to
factorize between the various */src/*/CMakeLists.txt files used to
build CGAL libraries.

For example, the definition of mangled names is now factorized in that
function.

Installation/src/CMakeLists.txt also sets the output directories for
runtime, shared libraries, and static libraries. DLLs will be created
in bin/ instead of lib/.
 2011-10-17 16:02:12 +00:00