songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
86,380 Commits 3 Branches 156 Tags 966 MiB
Commit Graph

3529 Commits

Author SHA1 Message Date
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
Andreas Fabri 8014920ae0 Fix CHANGES.md 2019-03-21 13:36:27 +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 0b31e6e5d8 Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF 2019-03-07 14:01:02 +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
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
Maxime Gimeno e2f2c63e76 Modifications after review 2019-01-23 11:25: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 18d9e72124 Fix doc and update CHANGES.md 2019-01-22 11:19:38 +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 3b1b6e2401 Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF 2019-01-09 12:35:04 +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
Laurent Rineau 1cb63b5e78 Bump the SONAME 2018-12-17 15:21:59 +01:00
Simon Giraudot 847a6d8a8f Add TensorFlow_neural_network_classifier to whitelisted headers 2018-12-14 10:22:11 +01:00
Laurent Rineau f6e83cd23e Move the definition of CGAL_USE_FILE in case of early return() 2018-12-13 10:59:00 +01:00
Simon Giraudot 3b0220482a Update CHANGES.md 2018-12-12 10:06:33 +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
Laurent Rineau 950fd19be6 Merge pull request #3482 from lrineau/Installation-LEDA_remove_ffriend_injection-GF 
Try to use LEDA without -ffriend-injection
 2018-12-10 14:38:23 +01:00
Simon Giraudot f520f9eb11 First version of NN with TensorFlow 2018-12-06 14:59:57 +01:00
Laurent Rineau a9ef1dd0a5 Really test with LEDA!! 2018-11-30 16:56:08 +01:00
Lingjie Zhu 73c2a418c6 fix SPDX license indentifier 2018-11-30 10:45:24 +01:00
Lingjie Zhu a4ef69a631 add package license 2018-11-30 15:24:16 +08:00
Andreas Fabri c570e86661 Removed unused typedef; Added to CHANGES.md 2018-11-29 08:12:26 +01:00
Efi Fogel 0ff6b941cb Added a note about a fix to the minkowski_sum_2() function in the 2D Minkowski sum package 2018-11-28 13:06:40 +02:00
Laurent Rineau 81cf49efb1 Fix the construction of CGAL_ROOT in header-only 
In header-only, `CGALConfig.cmake` constructs the path to the root of
the CGAL installation. It used to use `../` a lot, to go back in
parent directories, but:
  - that was... ugly,
  - and Ninja saw a problem with that (a warning about the path to
  `print_GMP_version.cpp`).

`CGALConfig.cmake` Now uses the CMake command `get_filename_component`.
 2018-11-28 09:46:53 +01:00
Laurent Rineau 263a5715f2 Try to use LEDA without -ffriend-injection 2018-11-26 16:34:12 +01:00
Maxime Gimeno 7b13f4a969 Add misisng license header, rename vtu functions and update change.md 2018-11-23 10:11:23 +01:00
Maxime Gimeno 33482dc532 Fix conflicts 2018-11-21 10:55:09 +01:00
Laurent Rineau c28c0a4b2d Fix a bug with CTest in non-header-only 
The pull-request https://github.com/CGAL/cgal/pull/3413 has introduced
a side-effect: CTest was broken when `CGAL_HEADER_ONLY=OFF`, for all
tests using a `.cin` or `.cmd` file. That is due to the variable
`CGAL_CURRENT_SOURCE_DIR` that was only filled by `UseCGAL.cmake`.

Now that we forbid CGAL directories without `CMakeLists.txt`, that
variable `CGAL_CURRENT_SOURCE_DIR` is now useless, and can be removed:
`CMAKE_CURRENT_SOURCE_DIR` is sufficient. That fixes the bug with
CTest, and also makes the CMake code a bit simpler.
 2018-11-19 14:33:54 +01:00
Sebastien Loriot 727824eda6
Merge pull request #3325 from efifogel/Aos_2-fixes-efif 
Aos 2: fixes
 2018-11-14 18:50:12 +01:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Sébastien Loriot 66f2d5404e remove extra / 2018-11-08 17:12:12 +01:00
Guillaume Damiand 0c3878694b Include CGAL_Common.cmake, where variable EIGEN3_USE_FILE is defined. 2018-11-06 11:03:59 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Guillaume Damiand ee4f7c5cd9 Resolve conflict 2018-11-02 19:13:25 +01:00
Sébastien Loriot bc073d6670 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2018-11-02 10:57:00 +01:00
Sébastien Loriot 9e9df2c196 Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2018-11-02 10:55:57 +01:00
Sébastien Loriot d940632471 Merge pull request #3258 from MaelRL/PMP-Filter_degenerate_polygon_soup_input-GF 
PMP: repair polygon soup
 2018-11-02 10:37:58 +01:00
Sébastien Loriot 056c778305 Merge pull request #3370 from maxGimeno/AABB_tree-Change_facegraph_triangle_primitive_id-GF 
Aabb_tree: change the id of AABB_face_graph_triangle_primitive and AABB_halfedge_graph_segment_primitive
 2018-11-02 10:34:26 +01:00
Sébastien Loriot e925b1aba6 Merge pull request #3225 from maxGimeno/Demo-Remove_polyhedron_item-GF 
Polyhedron demo: remove the Scene_polyhedron_item
 2018-10-30 15:50:17 +01:00
Maxime Gimeno cbf3e04fa6 Doc fix. 2018-10-30 14:15:01 +01:00
Maxime Gimeno 08a98a5603 Update Changes.md 2018-10-30 11:51:34 +01:00
Maxime Gimeno 50108dc627 Fix wrong policy setting 2018-10-29 14:25:47 +01:00
Maxime Gimeno 63488d81d1 Update Changes and doc 2018-10-29 12:59:44 +01:00
Laurent Rineau 01eaab049d Fix the logic: search for the TARGET, and not the content of WITH_CGAL... 2018-10-26 16:30:39 +02:00
Guillaume Damiand 9e3f264e2c Add an include CGAL_Common.cmake 2018-10-23 13:44:00 +02:00
Guillaume Damiand 7e022bacf6 Add a debug message, trying to understand where the problem comes from... 2018-10-23 09:09:45 +02:00
Guillaume Damiand d1a027bd2c Github lost my last push git status 2018-10-22 10:39:31 +02:00
Guillaume Damiand 152f34fd56 Change order of things, to be able to do include(CGAL_CreateSingleSourceCGALProgram.cmake) in all cases. 2018-10-22 10:31:06 +02:00
Guillaume Damiand 8f61243a13 Move one include after the definition of CGAL_MODULES_DIR 2018-10-19 10:18:37 +02:00
Laurent Rineau 980d254517 Re-add a missing line 2018-10-19 09:31:32 +02:00
Laurent Rineau 0dd59c1cfd Include CGAL_CreateSingleSourceCGALProgram.cmake in case of early return 2018-10-18 16:25:32 +02:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Efi Fogel 0446b84a8c Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-10-15 12:04:37 +03:00
Sébastien Loriot 9d88ce0826 update changes 2018-10-09 14:15:26 +02:00
Maxime Gimeno aa10bcc5b0 Update changes.md 2018-10-09 14:15:25 +02:00
Sébastien Loriot 3ebf53dc89 update changes 2018-10-09 10:47:51 +02:00
Sébastien Loriot e179770aab add skeleton for collision detection in PMP 2018-10-09 10:28:43 +02:00
Mael Rouxel-Labbé 6ffc97e67d Changed CHANGES.md 2018-10-08 19:43:50 +02:00
Laurent Rineau 5092db81c3 Merge pull request #3201 from kkatrio/repair_functions 
PMP: Add more repair functions
 2018-10-08 15:13:51 +02:00
Efi Fogel 5afbc4985a Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-10-06 18:36:51 +03:00
Laurent Rineau 0af5004048
Fix typo 2018-10-02 13:22:13 +00:00
Laurent Rineau 7cf19af58f `master` now targets CGAL-4.14 2018-10-01 15:11:49 +02:00
Laurent Rineau 48bb90a36e Polish CGAL-4.13 2018-10-01 10:55:07 +02:00
Laurent Rineau c6fe4b4e66 Merge pull request #3295 from sloriot/Argt-Dual_with_history 
Make Dual working with Argt_with_history
 2018-09-24 15:27:25 +02:00
Laurent Rineau f29919a03a Move the changes into the section CGAL-4.14 
and add backquotes for class or header names.
 2018-09-19 11:48:30 +02:00
Mael Rouxel-Labbé 1676cd7405 Merge branch 'repair_functions-old' into repair_functions 2018-09-17 15:10:39 +02:00
Laurent Rineau f8a37e59ef Fix issue #3317 by removing the unused module FindGLEW.cmake 2018-09-17 14:41:54 +02:00
Laurent Rineau 146fc90a33 This branch now targets a possible CGAL-4.12.2. 2018-09-17 11:43:31 +02:00
Simone Gasparini 3d38afce97
[doc] fix nested bullet list in INSTALL.md 
Only * - + are allowed for bullet lists
 2018-09-15 13:48:46 +02:00
Laurent Rineau ac173dfe44 Prepare CGAL-4.13 2018-09-12 11:07:03 +02:00
Efi Fogel a15560a7b1 Updated the release notes for 2D Arrangements for 4.13. 2018-09-10 22:12:51 +03:00
Efi Fogel c1b19fa355 Updated changes for 2D Arrangements 2018-09-09 16:56:23 +03:00
Efi Fogel 7f66adc81a Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-09-09 14:26:56 +03:00
Efi Fogel 41978f8d54 Updated changes for 2D Arrangements 2018-09-09 09:36:47 +03:00
Mael Rouxel-Labbé d1f969ec86 Changed CHANGES.md 2018-08-28 12:05:26 +02:00
Laurent Rineau 17fc9631cf Prepare CGAL-4.13-beta2, if needed 2018-08-01 16:22:31 +02:00
Maxime Gimeno 8d0a67095f Merge branch 'master' into IntrinsicFaceGraph-V2 2018-08-01 15:40:36 +02:00
Laurent Rineau f1e926e689 Update <CGAL/version.h> (for full header-only) 2018-07-31 16:26:54 +02:00
Laurent Rineau f1ebda2ef7 Reorder the sections 2018-07-31 16:22:23 +02:00
Laurent Rineau 9f5b89e33d Rewrap the CHANGES.md 2018-07-31 16:03:25 +02:00