Commit Graph

754 Commits

Author SHA1 Message Date
Simon Giraudot d8b51a9672 Merge remote-tracking branch 'laurent/Installation-remove_FindBLAS_LAPACK_TAUCS-GF' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-04-09 15:22:45 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +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 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 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 8539c09179 CGAL requires C++14. 2019-04-01 18:35:58 +02: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 4b7cc4a896 Fix the order of link of GMPXX when GMP is a static library. 2019-03-28 09:04:03 +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 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 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
Maxime Gimeno 1a6ef33010 WIP from git and upload to private page 2019-03-14 16:36:11 +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
Laurent Rineau ca67ac5c1f Remove all mentions of BLAS, LAPACK, and TAUCS in our CMake scripts 2019-03-07 09:40:08 +01:00
Maxime Gimeno aa76cd02b6 Use a single script for testsuite with or without docker 2019-03-06 14:17:48 +01:00
Maxime Gimeno 17079b0d53 Kill remote process if ssh is killed (ctrl+c or timeout) 2019-03-01 15:43:58 +01:00
Maxime Gimeno 902070d4d1 Add a label for push__oh_ 2019-02-28 16:32:01 +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 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
Maxime Gimeno ca4f5e12ed Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov 2019-02-12 15:58:49 +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 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
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 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 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
Simon Giraudot dc9d52f485 Update filename in whitelisted headers 2019-01-10 11:08:56 +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
Simon Giraudot 847a6d8a8f Add TensorFlow_neural_network_classifier to whitelisted headers 2018-12-14 10:22:11 +01:00
Laurent Rineau c14fda590d
Merge branch 'master' into CGAL-Fix_CTest-GF 2018-12-10 16:52:33 +01:00
Laurent Rineau a328ce9470 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2018-12-10 15:07:12 +01:00