357fe1e486
Fix CTest CGAL tests when binary dir is a sub-directory
...
When the current binary dir is a sub-directory of the current sources
dir, then the recursive copy of the sources dir to `__exec_test_dir/`
cannot be done. In that case, do not setup the fixture
directory. Tests can still be run in the source directory (and pollute
it).
2019-05-20 12:18:18 +02:00
90782d4b7f
Revert the merge of two pull-requests that target CGAL-4.14-branch
...
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
8e872081fc
Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
...
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
# Conflicts:
# .travis/build_package.sh
# Installation/cmake/modules/CGALConfig_binary.cmake.in
# Installation/cmake/modules/CGALConfig_install.cmake.in
# Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
# Installation/lib/cmake/CGAL/CGALConfig.cmake
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
# Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
43cc6b2b2d
CGAL_TweakFindBoost must be included before any call to FindBoost
2019-05-06 16:40:50 +02:00
91d7fd4cb2
CGAL_TweakFindBoost must be included first
2019-05-06 16:34:07 +02:00
212a088c5e
That variable CGAL_TweakFindBoost was useless if not set
2019-05-06 16:33:42 +02:00
d8e23fefd2
CGAL requires CMake 3.1, that know about Boost 1.56 or before
2019-05-06 16:33:01 +02:00
623fd4f10f
If BUILD_SHARED_LIBS is not defined, use Boost shared libs
2019-05-03 18:39:30 +02:00
7812d1b810
Boost: link with imported targets, if they exist
2019-04-29 16:36:04 +02:00
3cb372be34
Do not search for Boost thread when not needed
2019-04-29 15:24:51 +02:00
af52b353d2
Boost 1.70 uses the CMake Config mode, now
2019-04-26 17:12:54 +02:00
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
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
36dba385a0
Add a bunch of new Boost versions
2019-04-26 17:10:49 +02:00
f3bc713103
Typo in a comment
2019-04-26 17:10:35 +02:00
68f321c58d
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-04-08 15:58:27 +02:00
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
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
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
84b9328619
Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch
2019-03-29 15:49:12 +01:00
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
4b7cc4a896
Fix the order of link of GMPXX when GMP is a static library.
2019-03-28 09:04:03 +01:00
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
310ce89b91
Fix the order of link when GMP is a static lib
2019-03-27 17:51:24 +01:00
ea145c71fe
Merge pull request #3759 from maxGimeno/Cross_compilation-Update_scripts-GF
...
Testsuite : Use ctest
2019-03-26 17:01:56 +01:00
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
43167252fa
Fix cin management in CGAL_add_tests
2019-03-21 11:37:39 +01:00
6eab4c014c
Update the handle of .cin files with CGAL_RUN_TESTS_THROUGH_SSH
2019-03-21 09:52:53 +01:00
1a6ef33010
WIP from git and upload to private page
2019-03-14 16:36:11 +01:00
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
7c0d23b18f
Fix CGAL_DIR and change names in CGAL_add_tests
2019-03-12 10:13:07 +01:00
aa76cd02b6
Use a single script for testsuite with or without docker
2019-03-06 14:17:48 +01:00
17079b0d53
Kill remote process if ssh is killed (ctrl+c or timeout)
2019-03-01 15:43:58 +01:00
902070d4d1
Add a label for push__oh_
2019-02-28 16:32:01 +01:00
7407a432ce
Merge branch 'master' of https://github.com/CGAL/cgal into Cross_compilation-Update_scripts-GF
2019-02-28 11:59:04 +01:00
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
42f3928de3
Fix CGAL_DISABLE_GMP
2019-02-22 16:00:53 +01:00
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
5376673151
Fix the testsuite of Arrangement_on_surface_2
2019-02-21 17:00:53 +01:00
13e7f7633c
Fix push__of_ in arrangement
2019-02-21 16:56:34 +01:00
2ddee24f1a
Fix the dependencies
2019-02-21 16:09:42 +01:00
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
c01eddb62a
Remove unused LD_LIBRARY_PATH
2019-02-21 15:47:12 +01:00
a52f7198d2
WIP SSH
2019-02-20 16:46:28 +01:00
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
ca4f5e12ed
Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov
2019-02-12 15:58:49 +01:00
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
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
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
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
Maxime Gimeno