Commit Graph

2531 Commits

Author SHA1 Message Date
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 700da4729b Remove install command removed in a previous commit and reintroduce here by a wrong resolved. 2016-03-09 12:50:18 +01:00
Guillaume Damiand b9d209ee62 Search required third party library in find component macro. 2016-03-09 12:41:42 +01:00
Clement Jamin dd3ed5b07c Remove the "S" from HEADERS_ONLY 2016-03-09 10:58:55 +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
Guillaume Damiand f5baf48d5e Do not export cgal in header only mode 2016-03-09 10:32:32 +01:00
Guillaume Damiand ed2956eec2 Do not use qt5 module in header only mode 2016-03-09 10:31:17 +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
Guillaume Damiand c58ab58860 Do not empty cgal configured libraries variable in header only mode. 2016-03-09 10:31:17 +01:00
Guillaume Damiand c5bfaf53d0 Avoid the build of cgal library in header only mode 2016-03-09 10:31:16 +01:00
Guillaume Damiand 6d55c3b140 Do the target_link_libraries in all CGAL_XXX libraries only in non header only mode. 2016-03-09 10:22:43 +01:00
Clement Jamin fd1b4889f0 Disable auto-link when using header-only CGAL 2016-03-09 10:20:05 +01:00
Guillaume Damiand 19c28de969 Add option to enable cgal header only. 2016-03-09 10:20:05 +01:00
Sébastien Loriot 45406a5296 Merge pull request #788 from bo0ts/Installation-split_config-pmoeller
Split CGALConfig.cmake and CGALExports.cmake
2016-03-06 15:36:55 +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
Sébastien Loriot 10fd2ab2ff update changes 2016-02-22 13:03:51 +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
Philipp Möller c72cc9fa8a Remove outdated variables 2016-02-16 17:02:56 +01:00
Philipp Möller 732d6ccb96 Generate a config file for each lib 2016-02-16 17:02:56 +01:00
Philipp Möller 1a68a004c1 Split *Export.cmake files
Note that the build tree still uses a single CGALExports.cmake file,
while for each library a special export file is installed.
2016-02-16 17:02:56 +01:00
Philipp Möller 1aa334ff34 Remove unnecessary variable
Never used anywhere and does not work with out-of-source builds
anyway...
2016-02-16 17:02:56 +01:00
Philipp Möller 4211a4f01e Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS
This is a Cmake 2.4.3 variable that isn't even documented anymore.
2016-02-16 17:02:55 +01:00
Philipp Möller c3fba6c5ab Remove unnecessary variable
Correct name would be CMAKE_COLOR_MAKEFILE and default is ON anyway.
2016-02-11 15:58:14 +01:00
Philipp Möller 3b63763f5d Introduce CGAL_DOC_VERSION 2016-02-11 15:37:20 +01:00
Laurent Rineau aea00e0519 ./doc/ is not shipped in public tarballs 2016-02-10 18:54:59 +01:00
Laurent Rineau bbc11f1657 More polish
- Renamed "Reconstruction Simplification 2" to its real name
- move "Surface Mesh Parameterization"
2016-02-10 16:18:42 +01:00
Laurent Rineau 7e977b810e Polish the changes.html for CGAL-4.8
- Fix the imprecision in the text about `thread_local` and `std::mutex`.

- I have added `<code>`/`</code>` where needed.

- Remove the comments (because html2text does not process comments
  correctly).

- Add CSS rules for `<code>` (adapted from Github CSS sheet)

- Rewrap most paragraphs (they were too wide)

- Add the release dat
2016-02-10 12:50:14 +01:00
Sébastien Loriot 2ed0fc0fdf Merge pull request #151 from cjamin/gsoc2014-2d-reconstruction-ivovigan
2D Reconstruction Simplification, new package, GSoC 2014
2016-02-09 19:42:32 +01:00
Clement Jamin 57e1dc970f Move package to 4.8 2016-02-08 17:12:52 +01:00
Philipp Möller 43b33a5ae8 Mention dual function in changes.html 2016-02-02 16:00:31 +01:00
Philipp Möller 2c81c92e54 update changes.html 2016-02-02 16:00:31 +01:00
Simon Giraudot 66967ea600 Update changes.html 2016-01-27 11:10:25 +01:00
Laurent Rineau 79f2a3d0cf Fix a warning 2016-01-25 16:45:12 +01:00
Sebastien Loriot 6c88ccaeab Merge pull request #663 from afabri/CGAL-rename_cfg-GF
Fix macro name
2016-01-25 08:45:38 +01:00
Sébastien Loriot 551b3fa24d Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' into HEAD 2016-01-25 08:29:55 +01:00
Laurent Rineau 235b601b73 Fix a bug in Boost.Config<1.57 with gcc>=5.0
`BOOST_HAS_VARIADIC_TMPL` and `BOOST_NO_CXX11_VARIADIC_TEMPLATES` can be
wrong, with Boost-1.57 and gcc>=5.0.

Fixes the following warnings with gcc>=5.0 in C++98 mode:
> CGAL-4.8-Ic-106/include/CGAL/array.h:78:31: warning: variadic templates only available with -std=c++11 or -std=gnu++11
> template< typename T, typename... Args >
>                               ^
> CGAL-4.8-Ic-106/include/CGAL/array.h:80:28: warning: variadic templates only available with -std=c++11 or -std=gnu++11
> cpp11::array< T, 1 + sizeof...(Args) >
>                            ^
> CGAL-4.8-Ic-106/include/CGAL/array.h:81:42: warning: variadic templates only available with -std=c++11 or -std=gnu++11
>  make_array(const T & t, const Args & ... args)
>                                           ^
2016-01-25 08:28:06 +01:00
Sébastien Loriot 4c4b191209 Merge pull request #604 from bo0ts/BGL-add_clear-pmoeller
Add BGL helper CGAL::clear
2016-01-23 09:18:56 +01:00
Andreas Fabri 567f027484 Fix macro name 2016-01-21 11:32:48 +01:00
Sebastien Loriot 155dba5e96 Merge pull request #641 from lrineau/Installation-do_not_use_deprecated_macros_from_Boost_Config-lrineau
Boost.Config: check both deprecated name and new names (Boost>=1.50)
2016-01-21 09:25:57 +01:00
Sebastien Loriot a5ab3281d5 Merge pull request #642 from lrineau/Install-add_CGAL_CAN_USE_CXX11_ATOMIC-lrineau
Add <CGAL/atomic.h> and CGAL_CAN_USE_CXX11_ATOMIC
2016-01-21 09:25:39 +01:00
Sébastien Loriot cf08261299 Merge pull request #652 from sloriot/BGL-document_selection_functions
BGL: document selection functions
2016-01-20 17:13:21 +01:00
Sebastien Loriot 901a4c17e4 Merge pull request #650 from sloriot/BGL-document_split_in_polylines
BGL: document split in polylines
2016-01-20 16:50:36 +01:00
Sebastien Loriot 13943432b5 Merge pull request #580 from sgiraudot/Advancing_front-Generalize_filter-GF
Advancing front: generalize filter
2016-01-19 11:39:49 +01:00
Sébastien Loriot c1459d3f20 rename dilate/erode function after review 2016-01-19 11:32:49 +01:00
Sébastien Loriot fe9c3f7729 update changes 2016-01-19 11:32:23 +01:00
Laurent Rineau fa54f719e6 Oops! Fix the Boost atomic header 2016-01-19 10:34:55 +01:00
Sébastien Loriot 1792146afd document split_graph_into_polylines 2016-01-19 09:30:00 +01:00
Laurent Rineau 98a4949e96 Better version of <CGAL/atomic.h>
The implementation is simplified.

If no implementation of `::atomic` is available, `CGAL_NO_ATOMIC` is
defined to an error message (replaced the `#error`).
2016-01-18 15:51:34 +01:00
Laurent Rineau e1adbbfb7a Add #error Boost.Atomic was introduced in Boost-1.53 2016-01-15 18:59:34 +01:00
Laurent Rineau a32ba4b0af Boost.Config>=1.56 defines BOOST_NO_CXX11_HDR_ATOMIC 2016-01-15 18:46:46 +01:00
Laurent Rineau 68c6941cbb Add <CGAL/atomic.h> and CGAL_CAN_USE_CXX11_ATOMIC
- Change the way the macros `CGAL_CAN_USE_CXX11_THREAD_LOCAL` and
  `CGAL_CAN_USE_CXX11_MUTEX` are defined, so that other compilers are
  also supported.

- Add the macro `CGAL_CAN_USE_CXX11_ATOMIC` and the header
  `<CGAL/atomic.h>`.
2016-01-15 18:26:44 +01:00
Laurent Rineau 65cad196df Check both deprecated name and new names (Boost>=1.50)
The deprecated names may be removed from future versions of Boost, and
we do not want our C++11 support be dropped for users using newest
versions of Boost.
2016-01-15 17:47:45 +01:00
Sebastien Loriot 4e9448cb9e Merge pull request #451 from GilesBathgate/throwing-destructors
Introduces a CGAL_destructor_assertion macro.
2016-01-14 14:08:10 +01:00
Andreas Fabri 1f0e8324a3 Fix the name of libraries, on Windows
If CGAL_FULL_VERSION is not set in the cache, in the sub-directory src/ its value is empty. That creates wrong  library names, on Windows, such as:
  libCGAL_ImageIO-vc120-mt-.lib
2016-01-12 12:15:52 +01:00
Giles Bathgate f0ac236713 Introduces a GCAL_NO_ASSERTIONS_BOOL macro
This macro is always defined. Its value will be true when assertions are defined
and false when assertions are not defined. This macro can then be used in place
of a true false constant, such as is needed for CGAL_NOEXCEPT.
2016-01-08 20:31:59 +00:00
Philipp Möller 7ec3c25aa9 Update changes.html 2016-01-08 14:47:23 +01:00
Sébastien Loriot e64ae35a6e Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
Sébastien Loriot dd8f33adc5 Merge pull request #559 from lrineau/Mesh_3-remove_estimated_bbox-lrineau
Add bbox() to MeshDomain_3
2016-01-06 14:35:01 +01:00
Sebastien Loriot 2b49997c7e Merge pull request #493 from afabri/CGLAL-thread_local_storage-GF
Remove boost thread dependency
2016-01-04 16:49:26 +01:00
Sébastien Loriot c981ef2303 add missing license headers 2016-01-04 16:48:26 +01:00
Simon Giraudot bd361eaa40 Update changes.html 2016-01-04 12:07:24 +01:00
Sebastien Loriot 5e20b46f5b Merge pull request #546 from bo0ts/Pmp_triangulate_face-pmoeller
Add triangulate_face and triangulate_faces range overload
2016-01-04 10:48:17 +01:00
Sébastien Loriot dd955cef30 Merge pull-request #483 from 'janetournois/Mesh_3-gray_level_image_oracle-lrineau'
Mesh 3 : add gray level image oracle
2015-12-18 16:46:46 +01:00
Sebastien Loriot c1c30a46e5 Merge pull request #509 from sloriot/Install-fix_nsi
Install fix nsi
2015-12-18 15:16:29 +01:00
Philipp Möller 5349ee4dfc Move CGAL_FULL_VERSION to PARENT_SCOPE
This variable is more sensible to be used in documentation. The
corresponding set in non branch-build does not require a PARENT_SCOPE,
because it has no parent in the release layout.
2015-12-17 16:00:06 +01:00
Simon Giraudot c2003e8a2a Add test for c++1z and gnu++XX flags 2015-12-17 10:18:20 +01:00
Laurent Rineau 471c87e5ca Amend the changes log 2015-12-16 12:33:17 +01:00
Simon Giraudot 084bd22780 Update changes.html 2015-12-14 09:09:56 +01:00
Philipp Möller 22920671ee Update info in changes.html 2015-12-11 16:29:07 +01:00
Philipp Möller a66b5d5a09 Use doc/CMakeLists in a release 2015-12-10 17:05:51 +01:00
Giles Bathgate ab7b34846e Use boost detection of CXX11 noexcept keyword.
BOOST_NO_NOEXCEPT and BOOST_NO_CXX11_NOEXCEPT provide a more
convenient way of determining whether the CXX11 noexcept keyword
is available.

See: http://www.boost.org/doc/libs/1_50_0/libs/config/doc/html/boost_config/boost_macro_reference.html
2015-12-10 10:54:36 +00:00
Simon Giraudot 6a545a2483 Update changes.html 2015-12-04 12:35:34 +01:00
Andreas Fabri 4fec754ef8 put static into the macro and rename it 2015-12-02 20:40:15 +01:00
Andreas Fabri dd17f1ad5d Set BOOST_PARAMETER_MAX_ARITY to the needed value in the concerned packages 2015-12-01 17:05:53 +01:00
Sebastien Loriot b5546cb802 Merge pull request #486 from lrineau/Installation-visual_leak_detector-lrineau
Enable the use of Visual Leak Detector in CGAL
2015-11-26 14:30:14 +01:00
Sébastien Loriot 5de303c389 Merge pull request #501 from janetournois/PMP-add_utility_functions-GF
PMP : add utility functions
2015-11-26 14:22:05 +01:00
Clement Jamin 5eb2a28eea Merge branch 'gsoc2014-2d-reconstruction-ivovigan-old' into gsoc2014-2d-reconstruction-ivovigan 2015-11-25 16:25:48 +01:00
Sébastien Loriot e8e3efd617 fix url 2015-11-24 00:46:40 +01:00
Giles Bathgate 3a725499ad Introduces CGAL_NOEXCEPT macro.
This macro is available for future compatibility with c++11, which
by default marks destructors noexcept(true). Some destructors
in CGAL do throw exceptions an so should be marked noexcept(false).
Since noexcept is not available in c++0x and below the macro is
disabled when CGAL_CXX11 is not defined since it is not required.
2015-11-23 16:47:59 +00:00
Jane Tournois a61fefc839 Merge branch 'PMP-length_of_border-GF-old' into PMP-length_of_border-GF 2015-11-23 17:19:30 +01:00
Andreas Fabri bb9dddf336 Add a chapter in the developer manual. Fix a bug in tss.h in case CGAL_HAS_THREADS is not defined 2015-11-23 16:50:09 +01:00
Sébastien Loriot e997e68582 missing c++98 2015-11-23 10:23:57 +01:00
Sébastien Loriot 260a501941 support more g++ version and enhance doc 2015-11-23 10:21:21 +01:00
Sébastien Loriot d1489cd7e0 fix and simplify when boost libs are needed 2015-11-20 14:30:34 +01:00
Sébastien Loriot 86a2225a0c boost thread not needed if using gcc 4.8 or greater in c++1[1/4] mode 2015-11-19 18:55:42 +01:00
Jane Tournois b1e00b1f4a update changes.html 2015-11-17 17:30:23 +01:00
Sebastien Loriot d605b6b95f Merge pull request #457 from janetournois/Polygon_mesh_processing-local_remeshing-GF
Polygon mesh processing - add isotropic remeshing
2015-11-17 13:25:45 +01:00
Jane Tournois 3f308a48af Merge branch 'Mesh_3-gray_level_image_oracle-lrineau-old' into Mesh_3-gray_level_image_oracle-lrineau 2015-11-17 11:16:53 +01:00
Andreas Fabri 2ce8b07ec0 Define BOOST_PARAMETER_MAX_ARITY in <CGAL/config.h>
This macro has to be larger than the default value
and it must be set before including <boost/parameter.hpp>

Instead of setting it to 12 in the packages that
need it, we do this in <CGAL/config.h> and produce
an error if a user has set it to a value < 12
2015-11-16 11:21:31 +01:00
Andreas Fabri 9c08d41a54 Change the macro CGAL_THREAD_LOCAL_VARIABLE(TYPE,VAR,VAL)
VAL is the parameter to the variable VAR
2015-11-11 11:16:16 +01:00
Jane Tournois 70550aac03 todo : more documentation 2015-11-10 16:54:50 +01:00
Andreas Fabri 6b2c4dd7c6 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-11-09 14:26:42 +01:00
Jane Tournois d6207f50ba comment about new helper functions
also update PackageDescription.txt and fix it
2015-11-05 20:13:07 +01:00
Sébastien Loriot 0072b649e2 Merge branch 'old/Polygon_mesh_processing-local_remeshing-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 20:11:10 +01:00
Jane Tournois 340a52ac44 update doc wrt to @sloriot review 2015-11-05 20:09:15 +01:00
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