Laurent Rineau
6cff0987ad
Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
...
Adapt to Boost 1.70
2019-05-07 15:47:59 +02:00
Laurent Rineau
43cc6b2b2d
CGAL_TweakFindBoost must be included before any call to FindBoost
2019-05-06 16:40:50 +02:00
Laurent Rineau
91d7fd4cb2
CGAL_TweakFindBoost must be included first
2019-05-06 16:34:07 +02:00
Laurent Rineau
212a088c5e
That variable CGAL_TweakFindBoost was useless if not set
2019-05-06 16:33:42 +02:00
Laurent Rineau
d8e23fefd2
CGAL requires CMake 3.1, that know about Boost 1.56 or before
2019-05-06 16:33:01 +02:00
Laurent Rineau
dd703beff1
Merge pull request #3894 from lrineau/CGAL-Qt_version_5.9_or_later-GF
...
Document that Qt 5.9 or later is required
2019-05-06 15:01:58 +02:00
Laurent Rineau
623fd4f10f
If BUILD_SHARED_LIBS is not defined, use Boost shared libs
2019-05-03 18:39:30 +02:00
Laurent Rineau
9ec3481be2
Document that Qt 5.9 or later is required
2019-04-30 16:41:44 +02:00
Laurent Rineau
7812d1b810
Boost: link with imported targets, if they exist
2019-04-29 16:36:04 +02:00
Laurent Rineau
3cb372be34
Do not search for Boost thread when not needed
2019-04-29 15:24:51 +02:00
Laurent Rineau
af52b353d2
Boost 1.70 uses the CMake Config mode, now
2019-04-26 17:12:54 +02:00
Laurent Rineau
a9fd0a3729
Bug-fix: Boost Thread is a dependency of CGAL_Core only for GNU/g++
...
Previously, it was documented to g++ only, but the code was just
checking "not MSVC", and thus clang was in the set.
2019-04-26 17:12:01 +02:00
Laurent Rineau
6615d1d12d
Change the default value of CGAL_Boost_USE_STATIC_LIBS
...
It is now related to `BUILD_SHARED_LIBS`.
2019-04-26 17:11:24 +02:00
Laurent Rineau
36dba385a0
Add a bunch of new Boost versions
2019-04-26 17:10:49 +02:00
Laurent Rineau
f3bc713103
Typo in a comment
2019-04-26 17:10:35 +02:00
albert-github
1dd7473818
Correction of links
...
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Laurent Rineau
68f321c58d
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-04-08 15:58:27 +02:00
Laurent Rineau
b86532d357
Merge pull request #3830 from lrineau/Installation-fix_Windows_DLL_verinfo-lrineau
...
Fix CGAL DLLs verinfo on Windows
2019-04-08 15:57:31 +02:00
Laurent Rineau
ae1e01c983
Merge pull request #3840 from lrineau/Installation-remove_GMP_IN_CGAL_AUXILIARY-GF
...
Remove (GMP|MPFR)_IN_CGAL_AUXILIARY
2019-04-08 15:57:29 +02:00
Laurent Rineau
b392643a98
This branch now targets 4.13.2.
2019-04-05 14:50:41 +02:00
Laurent Rineau
d07a2c9184
Remove (GMP|MPFR)_IN_CGAL_AUXILIARY
...
There was a bug in `FindGMP.cmake` and `FindMPFR.cmake`: they were
using the undefined macro `cache_set`.
I have removed those variables definitions, and wrote the code
differently where they were used.
2019-04-04 15:25:01 +02:00
Laurent Rineau
5a67ea92fc
Fix the verinfo of CGAL DLLs, on Windows
...
And fix the test files.
2019-04-03 14:15:58 +02:00
Laurent Rineau
85047bcb61
Sneak a new feature in this branch: detect unused .cpp files
...
For the moment, the feature is far from being ready:
- in case of header-only, the .cpp sources files of CGAL libraries are
reported,
- when a dependency for a test/examples is missing, the corresponding
.cpp files is reported,
- and I have no clue which CMake version is required.
But I found real issues.
By default, the feature is OFF. It will only be activated if the CMake
variable or cache variable `CGAL_CHECK_UNUSED_CPP_FILES` is true. We
might activate it on a per-directory basis... or have it by default,
and deactivate it per-directory. We'll see. For the moment, let's keep
it deactivated.
2019-04-03 14:11:50 +02:00
Laurent Rineau
57a41b3d2a
Towards CGAL-4.14.1
2019-03-29 15:59:03 +01:00
Laurent Rineau
84b9328619
Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch
2019-03-29 15:49:12 +01:00
Laurent Rineau
8c4032262f
Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
...
Fix the order of link when GMP is a static lib
2019-03-28 16:49:51 +01:00
Laurent Rineau
99ca804f6d
Maybe tonight's internal release will be CGAL-4.14 final
2019-03-28 16:45:09 +01:00
Laurent Rineau
4b7cc4a896
Fix the order of link of GMPXX when GMP is a static library.
2019-03-28 09:04:03 +01:00
Laurent Rineau
fc81d3bfec
Merge pull request #3780 from afabri/CGAL-links-GF
...
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Laurent Rineau
c988d7d1af
Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
...
Fix the order of link when GMP is a static lib
2019-03-27 18:04:59 +01:00
Laurent Rineau
e9f36ff557
Prepare for CGAL-4.14-beta4
2019-03-27 18:03:07 +01:00
Laurent Rineau
310ce89b91
Fix the order of link when GMP is a static lib
2019-03-27 17:51:24 +01:00
Laurent Rineau
ea145c71fe
Merge pull request #3759 from maxGimeno/Cross_compilation-Update_scripts-GF
...
Testsuite : Use ctest
2019-03-26 17:01:56 +01:00
Laurent Rineau
15d74af234
Bump the SONAME of libCGAL_Qt5.so
...
```
ABI changes between build CGAL-4.14-0.1beta2.fc30 and its latest stable build
================================================================================
This file contains possible ABI changes which have occurred due to this package update against latest stable build available in koji for the given Fedora release.
If you want to filter out these kind of ABI changes in the future, you can add a proper .abignore file to this package. To know more about how to write one, please look at the wiki page https://fedoraproject.org/wiki/Taskotron/Tasks/dist.abicheck#filtering .
On armv7hl architecture
*************************
* No ABI change between:
CGAL-devel-4.13-3.fc30.armv7hl.rpm
CGAL-devel-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 8.88 second(s).
* ABI changes found between:
CGAL-4.13-3.fc30.armv7hl.rpm
CGAL-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 11.54 second(s). Please review them.
================ changes of 'libCGAL_Qt5.so.13.0.2'===============
Functions changes summary: 0 Removed, 1 Changed, 0 Added function
Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
1 function with some indirect sub-type change:
[C]'method CGAL::Qt::DemosMainWindow::DemosMainWindow(QWidget*, Qt::WindowFlags)' at DemosMainWindow_impl.h:62:1 has some indirect sub-type changes:
return type changed:
in pointed to type 'class CGAL::Qt::DemosMainWindow' at DemosMainWindow.h:52:1:
type size changed from 544 to 608 (in bits)
1 data member insertion:
'QSettings CGAL::Qt::DemosMainWindow::settings', at offset 544 (in bits) at DemosMainWindow.h:129:1
================ end of changes of 'libCGAL_Qt5.so.13.0.2'===============
Removed binaries:
/usr/lib/libCGAL_ImageIO.so.13.0.2, SONAME: libCGAL_ImageIO.so.13
Added binaries:
/usr/lib/libCGAL_ImageIO.so.14.0.0, SONAME: libCGAL_ImageIO.so.14
* No ABI change between:
CGAL-demos-source-4.13-3.fc30.armv7hl.rpm
CGAL-demos-source-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 8.67 second(s).
```
https://taskotron.fedoraproject.org/artifacts/all/bfca5e3c-4aff-11e9-b891-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log
2019-03-26 10:49:31 +01:00
Laurent Rineau
bc6954af01
Fix an error in Fedora RPM
...
```
CGAL-devel.x86_64: E: zero-length /usr/lib64/cmake/CGAL/config/support/test_syntaxonly.cpp
```
https://taskotron.fedoraproject.org/artifacts/all/bf72d02c-4aff-11e9-a48a-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log
2019-03-26 10:49:00 +01:00
Maxime Gimeno
43167252fa
Fix cin management in CGAL_add_tests
2019-03-21 11:37:39 +01:00
Laurent Rineau
6eab4c014c
Update the handle of .cin files with CGAL_RUN_TESTS_THROUGH_SSH
2019-03-21 09:52:53 +01:00
Andreas Fabri
a472c24185
http:/www.boost.org -> https://www.bost.org
2019-03-20 08:59:22 +01:00
Laurent Rineau
4782ea1665
Fix the *installed* header-only CGALConfig.cmake
...
The previous installed version of `CGALConfig.cmake`, when
`CGAL_HEADER_ONLY` is true, was hard-coding a path `../../../`,
relative to the location of itself. It might be that the CMake modules
are not installed in a sub-directory with three components, relatively
to the prefix.
That way of doing it buggy. And that triggered issue with the cgal
port in vcpkg:
https://github.com/Microsoft/vcpkg/pull/5734
This patch is just another hack: it hardcodes that the relative path
can be any of:
- `../`,
- `../../`, or
- `../../../`.
2019-03-19 16:49:31 +01:00
Maxime Gimeno
1a6ef33010
WIP from git and upload to private page
2019-03-14 16:36:11 +01:00
Laurent Rineau
43d1948396
master now targets a possible CGAL-4.14-beta3
2019-03-13 17:15:45 +01:00
Maxime Gimeno
330c6ec9b1
Merge pull request #3759 from maxGimeno/Cross_compilation-Update_scripts-GF
...
Testsuite : Use ctest
2019-03-12 17:04:19 +01:00
Maxime Gimeno
64cfc19d68
Remove -d option. Any HOST declared as not localhost will be considered as a remote host and launch the cross compilation.
2019-03-12 14:58:11 +01:00
Maxime Gimeno
7c0d23b18f
Fix CGAL_DIR and change names in CGAL_add_tests
2019-03-12 10:13:07 +01:00
Maxime Gimeno
aa76cd02b6
Use a single script for testsuite with or without docker
2019-03-06 14:17:48 +01:00
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
Maxime Gimeno
17079b0d53
Kill remote process if ssh is killed (ctrl+c or timeout)
2019-03-01 15:43:58 +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
Maxime Gimeno
902070d4d1
Add a label for push__oh_
2019-02-28 16:32:01 +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
Maxime Gimeno
7407a432ce
Merge branch 'master' of https://github.com/CGAL/cgal into Cross_compilation-Update_scripts-GF
2019-02-28 11:59:04 +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
Maxime Gimeno
42f3928de3
Fix CGAL_DISABLE_GMP
2019-02-22 16:00:53 +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
5376673151
Fix the testsuite of Arrangement_on_surface_2
2019-02-21 17:00:53 +01:00
Maxime Gimeno
13e7f7633c
Fix push__of_ in arrangement
2019-02-21 16:56:34 +01:00
Laurent Rineau
2ddee24f1a
Fix the dependencies
2019-02-21 16:09:42 +01:00
Laurent Rineau
1e17519384
Fixes
...
- The dependencies of push_of__ tests were not correct.
- Fix the handling of tests with .cin, when ssh/scp are used.
2019-02-21 15:49:48 +01:00
Maxime Gimeno
c01eddb62a
Remove unused LD_LIBRARY_PATH
2019-02-21 15:47:12 +01:00
Maxime Gimeno
a52f7198d2
WIP SSH
2019-02-20 16:46:28 +01: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
Laurent Rineau
a8c6505642
Merge pull request #3446 from sloriot/Installation-extra_slash
...
Clean-up include dir in CGALconfig.cmake
2019-01-22 09:13:23 +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