Commit Graph

3393 Commits

Author SHA1 Message Date
Laurent Rineau 911e44a1fe Prepare for beta2 2019-03-04 18:35:48 +01:00
Laurent Rineau f704c838fd Rewrap CHANGES.md 2019-03-01 16:27:22 +01:00
Laurent Rineau 01e5727a50 Prepare CGAL-4.14-beta1 2019-03-01 16:27:11 +01:00
Laurent Rineau 3f66d8f00a Merge pull request #3718 from lrineau/CGAL-SOVERSION_for_CGAL_ImageIO-GF
Allow to have different SOVERSION for each CGAL libraries
2019-02-28 20:54:43 +01:00
Laurent Rineau 8eee6f3e0c Allow to have different SOVERSION for each CGAL libraries
In CGAL-4.14, I would like to have `libCGAL.so.13` (to keep
compatibility), but `libCGAL_Image.so.14` (to break compatibility).
2019-02-28 14:26:02 +01:00
Laurent Rineau d5664ad071
typo 2019-02-25 09:54:04 +00:00
Laurent Rineau 5e96380e55
Merge branch 'master' into Bso-validation-efif 2019-02-25 09:53:15 +00:00
Efi Fogel 07f9ac6430 Fixed the validation of orientation. (This time fixed it right...) 2019-02-23 11:20:56 +02:00
Laurent Rineau 5199eb70ee Merge pull request #3283 from imiordanov/Periodic_4_hyperbolic_triangulation_2-IIordanov
New packages: Hyperbolic_triangulation_2 / Periodic_4_hyperbolic_triangulation_2
2019-02-22 16:39:12 +01:00
Laurent Rineau 7cf4a1fff8
Merge pull request #3501 from lrineau/CGAL-fix_with_LEDA_without_CGAL_Core-GF
Partially fix the testsuite with LEDA instead of GMP
2019-02-22 10:04:22 +00:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Laurent Rineau 962afbfade Merge pull request #3343 from sgiraudot/Point_set_3-v2-GF
[Small Feature] Point Set 3 v2
2019-02-13 15:38:53 +01:00
Maxime Gimeno ca4f5e12ed Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov 2019-02-12 15:58:49 +01:00
Andreas Fabri b84f54a9e3 Do not define the macro CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS for VC2013 as suggested in Issue #3436 2019-02-08 09:46:18 +01:00
Laurent Rineau 9b71af64c8 Add -Wno-cast-function-type to fix a warning in Qt5
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.14-Ic-117/Polyhedron_Demo/TestReport_lrineau_Ubuntu-latest-GCC6-CXX1z.gz
```
/usr/local/bin/c++  -DCGAL_EIGEN3_ENABLED -DCGAL_TEST_SUITE=1 -DCGAL_USE_GMP -DCGAL_USE_MPFR -DCGAL_USE_ZLIB=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NO_KEYWORDS -DQT_OPENGL_LIB -DQT_SCRIPT_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -DSCENE_IMAGE_GL_BUFFERS_AVAILABLE -DUSE_FORWARD_DECL -Dpolyhedron_demo_EXPORTS -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/polyhedron_demo_autogen/include -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/./CGAL_demo -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/./include -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/. -isystem /usr/include/x86_64-linux-gnu -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/include -I/mnt/testsuite/include -isystem /usr/include/eigen3 -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtOpenGL -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt5/QtSvg -I/usr/include/x86_64-linux-gnu/qt5/QtXml -I/usr/include/x86_64-linux-gnu/qt5/QtScript  -DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z -frounding-math -fPIC   -Wno-deprecated-copy -Wall -frounding-math -fPIC -std=gnu++11 -o CMakeFiles/polyhedron_demo.dir/MainWindow.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp
In file included from /usr/include/x86_64-linux-gnu/qt5/QtScript/QScriptEngine:1,
                 from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.h:10,
                 from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp:4:
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h: In instantiation of 'int qScriptRegisterMetaType(QScriptEngine*, QScriptValue (*)(QScriptEngine*, const T&), void (*)(const QScriptValue&, T&), const QScriptValue&, T*) [with T = CGAL::Three::Scene_item*]':
/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp:313:67:   required from here
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h:390:18: warning: cast between incompatible function types from 'QScriptValue (*)(QScriptEngine*, CGAL::Three::Scene_item* const&)' to 'QScriptEngine::MarshalFunction' {aka 'QScriptValue (*)(QScriptEngine*, const void*)'} [-Wcast-function-type]
  390 |         eng, id, reinterpret_cast<QScriptEngine::MarshalFunction>(toScriptValue),
      |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h:391:9: warning: cast between incompatible function types from 'void (*)(const QScriptValue&, CGAL::Three::Scene_item*&)' to 'QScriptEngine::DemarshalFunction' {aka 'void (*)(const QScriptValue&, void*)'} [-Wcast-function-type]
  391 |         reinterpret_cast<QScriptEngine::DemarshalFunction>(fromScriptValue),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
2019-02-07 17:49:14 +01:00
Laurent Rineau 9a03d47cb0 Merge pull request #3297 from maxGimeno/Stream_support-Dont_use_vtk_for_vtu-GF
Stream support: VTP and VTU writing functions
2019-02-07 13:31:23 +01:00
Laurent Rineau 1a45e1c753 Merge pull request #3535 from sgiraudot/Classification-Neural_network_and_parallelized_random_forest-GF
[Small Feature] Classification: Neural Network and parallelized Random Forest
2019-02-07 13:31:20 +01:00
Laurent Rineau 0ca486665a Merge pull request #3654 from maxGimeno/Triangulation_fix_tests_for_clang-GF
Triangulation: Fix the tests for GCC<4.4 so it wont match clang.
2019-02-07 13:30:46 +01:00
Simon Giraudot 62a50da351 Update CHANGES.md 2019-02-07 11:36:05 +01:00
Laurent Rineau 27f1dc4a62 Do no always search for GMPXX
There is a kind of bug in `UseCGAL.cmake`, that enables GMPXX if it is
found, even if `WITH_GMPXX` is `OFF`. If GMPXX is never search for,
that should avoid it to be accidentally activated on platforms we do
not want it.
2019-02-07 10:12:51 +01:00
Laurent Rineau 2455affba0 Move the addition of -Wno-deprecated-copy to CGAL_Qt5 setup
That way:
  - that will work, even if CGAL CXX_FLAGS are copied (when hte CMake
    options `CGAL_DEV_MODE` or `RUNNING_CGAL_AUTO_TEST` are `ON`),
  - that will affect all CGAL Qt5 demos at once.
2019-02-06 11:47:44 +01:00
Laurent Rineau 02690350ee Replace include(CTest) by minimal usage
- Define the option `BUILD_TESTING`
- Call to `enable_testing()` if `BUILD_TESTING` is on.
2019-02-04 15:30:24 +01:00
Laurent Rineau f37ac9cfc6 Fix non-header-only CGALConfig.cmake as regards to CGAL_Core
... and then fix the `CMakeLists.txt` of HDT2_demo.
2019-02-04 15:09:07 +01:00
Maxime Gimeno de8dde79f4 Replace not by ! in preprocessor directives 2019-02-04 10:40:00 +01:00
Laurent Rineau c9164a0660
Merge branch 'master' into Stream_support-Dont_use_vtk_for_vtu-GF 2019-01-22 12:06:08 +01:00
Maxime Gimeno 549568a954 Fix conflicts 2019-01-22 10:08:48 +01:00
Laurent Rineau f5a8686cf3 Merge pull request #3439 from aboudev/VSA-lingjie
New package: Surface_mesh_approximation
2019-01-22 09:17:35 +01:00
Laurent Rineau 0c1517d97e Merge pull request #3446 from sloriot/Installation-extra_slash
Clean-up include dir in CGALconfig.cmake
2019-01-22 09:15:24 +01:00
Laurent Rineau cd75eac35a Merge pull request #3486 from efifogel/Ms_2-empty_ouetr_boundary-efif
Fixed face filtering in case one of the summands does not have an out…
2019-01-22 09:15:21 +01:00
Laurent Rineau 026868a294 Merge pull request #3552 from lrineau/Image_IO-Image_3_maybe_not_own_the_data-GF
Add a non-documented API, to allow CGAL::Image 3 not to own its data
2019-01-22 09:15:15 +01:00
Maxime Gimeno d52718f312 Fix Conflicts 2019-01-21 10:03:31 +01:00
Laurent Rineau 11db055bfe Modify CHANGES.md
Split the changes into two different paragraphs (2D/3D meshes, and
BGL).
2019-01-17 16:03:48 +01:00
Laurent Rineau 1754057d24 My changes to write_vtu 2019-01-16 16:50:45 +01:00
Laurent Rineau 40cf3869ba My changes for write_vtp 2019-01-16 16:15:01 +01:00
Maxime Gimeno cb10422e3c Fix indentation and markdown 2019-01-16 10:44:30 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Simon Giraudot dc9d52f485 Update filename in whitelisted headers 2019-01-10 11:08:56 +01:00
Laurent Rineau c9fb876574
Merge branch 'master' into VSA-lingjie 2019-01-10 10:13:09 +01:00
Maxime Gimeno 1006be85bd Fix Conflicts 2019-01-09 12:29:20 +01:00
Iordan Iordanov 59b212968e Added new packages to CHAMGES.md 2019-01-08 17:43:20 +01:00
Andreas Fabri 6b00750ecf Add to CHANGES.md 2019-01-08 09:47:12 +01:00
Laurent Rineau 65a31133fa
Merge branch 'master' into Ms_2-empty_ouetr_boundary-efif 2019-01-07 16:24:42 +01:00
Simon Giraudot e5c2d12ce3 Merge branch 'Classification-Neural_network_and_parallelized_random_forest-GF-old' into Classification-Neural_network_and_parallelized_random_forest-GF 2019-01-07 11:54:41 +01:00
Simon Giraudot c81fbe4688 Move all classifiers based on other libraries to dedicated namespaces 2019-01-07 11:50:02 +01:00
Simon Giraudot 3b246294bf Update CHANGES.md 2019-01-04 14:39:29 +01:00
Sébastien Loriot 0ec2fa5136 update changes 2018-12-21 13:14:23 +01:00
Simon Giraudot 3cc1b995be Merge remote-tracking branch 'mine/Classification-Neural_network_and_parallelized_random_forest-GF' into Classification-Neural_network_and_parallelized_random_forest-GF 2018-12-21 10:31:00 +01:00
Mael Rouxel-Labbé 15fe22cc6d Micro fix to gpl.h.in and added licenses for HT_2 and P4HT_2
(re-generated all the licenses on the way)
2018-12-19 18:38:05 +01:00
Laurent Rineau 47cdc92064 Merge pull request #3463 from lrineau/CGAL-Fix_CTest-GF
Fix CTest after #3413
2018-12-19 16:12:29 +01:00
Laurent Rineau 57b2fbdbfb Merge pull request #3485 from afabri/BGL-write_wrl-GF
BGL: Add write_wrl() for FaceGraph
2018-12-19 16:12:26 +01:00