Commit Graph

64306 Commits

Author SHA1 Message Date
Laurent Rineau a1c9ef62d1 Fix last CMake issues in test/Installation/ 2015-07-14 18:17:54 +02:00
Laurent Rineau c774546e1b A better fix, using operator->() 2015-07-14 18:02:40 +02:00
Laurent Rineau abb42e214b Merge remote-tracking branch 'cgal/releases/CGAL-4.6-branch'
This is a no-op commit: the diff was already in `master`.

Conflicts:
	Triangulation/include/CGAL/Triangulation_full_cell.h
2015-07-14 17:03:57 +02:00
Laurent Rineau 74cfacf554 Merge pull request #159 from lrineau/Triangulation-fix_issue_158-lrineau
dD Triangulation: Make non-template methods inline
2015-07-14 17:02:28 +02:00
Laurent Rineau fa28b44ea3 Merge pull request #144 from sgiraudot/Polyhedron_demo-Scale_space_plugin_speedup-sgiraudot
speedup the scale space plugin in the Polyhedron demo
2015-07-14 16:48:08 +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 4ee4d8a5f7 Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF
Conflicts:
	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
2015-07-14 15:05:45 +02:00
Laurent Rineau 72ff845de9 Prepare for CGAL-4.7-alpha1 2015-07-14 13:10:47 +02:00
Laurent Rineau 72104a5d29 Add link_to_CGAL_Qt5 2015-07-13 17:37:52 +02:00
Laurent Rineau 6dcd671ffe Rename the test file
That fixes the following CMake warning:

    -- Configuring test in test/Snap_rounding_2
    Requested component: Core
    Requested component: MPFR
    Requested component: GMP
    CMake Warning (dev) at
    Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake:19
    (add_executable):
       Policy CMP0037 is not set: Target names should not be reserved and should
       match a validity pattern.  Run "cmake --help-policy CMP0037" for policy
       details.  Use the cmake_policy command to set the policy and suppress this
       warning.

       The target name "test" is reserved or not valid for certain CMake features,
       such as generator expressions, and may result in undefined behavior.
    Call Stack (most recent call first):
       buildEX/test/Snap_rounding_2/CMakeLists.txt:19
    (create_single_source_cgal_program)
    This warning is for project developers.  Use -Wno-dev to suppress
       it.
2015-07-13 16:00:26 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau 2a5740afc9 Rename the test file
That fixes the following CMake warning:

    -- Configuring test in test/Snap_rounding_2
    Requested component: Core
    Requested component: MPFR
    Requested component: GMP
    CMake Warning (dev) at
    Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake:19
    (add_executable):
       Policy CMP0037 is not set: Target names should not be reserved and should
       match a validity pattern.  Run "cmake --help-policy CMP0037" for policy
       details.  Use the cmake_policy command to set the policy and suppress this
       warning.

       The target name "test" is reserved or not valid for certain CMake features,
       such as generator expressions, and may result in undefined behavior.
    Call Stack (most recent call first):
       buildEX/test/Snap_rounding_2/CMakeLists.txt:19
    (create_single_source_cgal_program)
    This warning is for project developers.  Use -Wno-dev to suppress
       it.
2015-07-13 15:37:10 +02:00
Andreas Fabri ddd3e2de63 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-13 14:58:33 +02:00
Andreas Fabri 8a3a5e5791 Add Svg 2015-07-13 14:58:17 +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 7f4bd2837e accomodate changes after branch update 2015-07-13 09:59:12 +02:00
Sébastien Loriot 1950bf0d7d update user manual for keep/remove_connected_components 2015-07-13 09:27:51 +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
Sébastien Loriot c60fad0095 use keep_connected_components in the implementation of keep_largest_connected_components 2015-07-13 07:43:50 +02:00
Sébastien Loriot 1fcc8937ab add todo 2015-07-13 07:14:30 +02:00
Sébastien Loriot 7d8fe2553d add remove_connected_components + overload for the keep version using cc ids 2015-07-13 07:08:45 +02:00
Sven Oesau 6babcf966f fixed warnings 2015-07-11 12:24:10 +02:00
Sven Oesau 3f96610bcb checking range for bitmap access in connected component
shortening some lines
2015-07-10 23:17:42 +02:00
Laurent Rineau ff1591f65f updated crontab (automated commit) 2015-07-10 19:18:03 +02:00
Laurent Rineau f2e2f7aca2 Merge pull request #163 from mglisse/patch-1
Typo in sse2.h
2015-07-10 19:02:08 +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 6d892480be Merge branch 'lrineau/CGAL_ImageIO-fix_VTK_6_support-lrineau' into CGAL-Qt5_support-GF
Conflicts:
	CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt
	Installation/changes.html
2015-07-10 18:05:25 +02:00
Laurent Rineau ae6412fb96 Merge modifications made by Andreas to 'sdglinf-philaris' for Qt5
Merge remote-tracking branch 'cgal-dev/sdglinf-philaris' into CGAL-Qt5_support-GF
2015-07-10 17:28:44 +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 9f5b43ec36 Fix the \cgalPkgSince 2015-07-10 17:21:36 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 3708b2da47 Re-add a file removed by error
This partially reverts commit 842b3bb5b4,
reversing changes made to df76f756d4.

Only the file:

	Mesh_3/examples/Mesh_3/data/liver.inr.gz

is modified (re-added).
2015-07-10 16:04:34 +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
Andreas Fabri b13867ecd4 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-10 15:03:56 +02:00
Andreas Fabri 842b3bb5b4 static_cast, less typename, fix CMakeLists 2015-07-10 15:03:39 +02:00
Sébastien Loriot e0a8a32bd9 change the release number of introduction 2015-07-10 14:46:05 +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
Andreas Fabri 2dfa5608c4 fix policy; remove button; fix about 2015-07-10 13:53:56 +02:00
Maxime Gimeno 9bb28e331e Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-10 13:46:04 +02:00
Maxime Gimeno 3b8f0e471f gl functions fix
- added a QOpenGLFunctions item to scene_item
2015-07-10 13:45:14 +02:00
Andreas Fabri 039860653a the demo now compiles with QT5 2015-07-10 13:20:09 +02:00