Commit Graph

2926 Commits

Author SHA1 Message Date
Laurent Rineau 9c350f2c47 Fix CMake errors in CGAL demos, with CMake<3.4 2017-11-20 10:41:44 +01:00
Laurent Rineau cf6522dba6 Fix CMake error on Windows about Boost.Thread and CGAL_Core 2017-11-20 10:40:45 +01:00
Laurent Rineau 891a83840e Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF 2017-11-17 15:03:57 +01:00
Laurent Rineau 8a260c4c32 Remove CGAL setup flags
@afabri This commit removes our tricks with the compilation flags.
2017-11-17 12:57:12 +01:00
Laurent Rineau 1dd41508fe Fix the syntax error with CMake<=3.3 2017-11-17 11:33:56 +01:00
Laurent Rineau 0c5ffa9968 Fix Boost usage on Windows 2017-11-17 11:06:32 +01:00
Laurent Rineau 21dabf1b1b Add compilation tests for demos 2017-11-16 18:45:33 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Laurent Rineau 6804eadd98 Fill the CMAKE_CONFIGURE_DEPENDS directory property
... with each `.cin` and `.cmd` files that are used.
2017-11-15 18:55:25 +01:00
Laurent Rineau 6aae344f9c Enable CTest from sub-directories of CGAL 2017-11-15 18:43:44 +01:00
Laurent Rineau ffe500eb29 Remove the deprecation warning, for now. 2017-11-15 17:29:45 +01:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01:00
Laurent Rineau 489e1b2ae1 Remove debug message 2017-11-15 14:47:34 +01:00
Laurent Rineau 7cff890473 Change the installation of CGALConfig.cmake 2017-11-15 14:45:23 +01:00
Laurent Rineau 3f3f5b1a52 Do not rely on CMAKE_MODULE_PATH 2017-11-15 14:45:12 +01:00
Laurent Rineau e17736a9d9 Change the default INSTALL_CMAKE_DIR 2017-11-15 14:30:43 +01:00
Laurent Rineau fe24a4db68 Explicit the dependencies of QGLViewer 2017-11-14 14:08:55 +01:00
Laurent Rineau 1d63eeb5dc Add support for testing on Android 2017-11-14 10:39:35 +01:00
Laurent Rineau 264c23294f Ease the cross-compilation 2017-11-14 10:38:51 +01:00
Laurent Rineau d3cc5ee30d Bump CGAL/version.h to 4.12-dev 2017-11-13 15:11:59 +01:00
Laurent Rineau 283f8138d8 CGAL_Core needs Boost.Thread 2017-11-13 14:41:03 +01:00
Laurent Rineau 03f84dc94b Handle the compiler flags
That setup was previously in `Installation/CMakeLists.txt`.
2017-11-13 14:28:51 +01:00
Laurent Rineau 8c44bceedd Fix a typo 2017-11-13 13:51:23 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Laurent Rineau 838217a153 CGAL_CURRENT_SOURCE_DIR is no longer used/filled 2017-11-13 11:49:07 +01:00
Laurent Rineau c6068691fa Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
Clement Jamin abd9616231 Hide the CMake option we added for "step 1" 2017-11-13 10:09:22 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Laurent Rineau 260c4dac61 Fix the API of cgal_add_test 2017-11-03 15:05:35 +01:00
Laurent Rineau 252eb66dc2 Split cgal_add_test further, with the new cgal_setup_test_properties 2017-11-03 11:13:49 +01:00
Laurent Rineau 855d995e1e Improvements
- split `cgal_add_test()` into `cgal_add_test()` and
  `cgal_add_compilation_test()`

- `cgal_add_test()` have more parameters:
  - an optional custom `TEST_NAME`,
  - extra arguments to use for the test.

- Add CTest support for `test/Sweep_line_2/`
2017-11-03 09:34:55 +01:00
Laurent Rineau 39cb35b134 Avoid CMake errors with CMake<=3.4 2017-10-31 13:37:43 +01:00
Laurent Rineau 633374027b Do not run a test if the compilation failed
The test binary may have been compiled in a previous compilation.
But if the current compilation failed, do not run the test.
2017-10-26 19:50:40 +02:00
Laurent Rineau 6c24ed92e5 Deal with comments (`#`) in test/Set_movable_separability_2/*.cmd 2017-10-24 11:46:40 +02:00
Laurent Rineau 1fbdd79363 Avoid adding the same test twice 2017-10-23 16:10:06 +02:00
Laurent Rineau 45d60917e4 Use CMake 3.7 fixtures, to execute in a dedicated directory 2017-10-20 17:02:32 +02:00
Laurent Rineau a335b979f2 Include the file only once, in a all-CGAL build 2017-10-20 17:02:15 +02:00
Laurent Rineau e73c95d4cd Do not test demos 2017-10-20 17:01:43 +02:00
Laurent Rineau 9a127c6f5d Add CMake option CGAL_CTEST_DISPLAY_MEM_AND_TIME
"Display memory and real time usage at end of CTest test outputs"
2017-10-20 10:26:11 +02:00
Laurent Rineau a63cfa9612 Parse the XML file Test.xml from `ctest -D`
... eventually, that will help move from our testsuite scripts to
CTest testsuite, plus CDash.
2017-10-20 00:15:04 +02:00
Laurent Rineau 75e61a8eb9 Merge pull request #2471 from jubalh/master
Include OpenGL ES for arm
2017-10-13 16:53:44 +02:00
Laurent Rineau 05a3370ad3 Rename to <CGAL/functional.h> 2017-10-04 16:32:11 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Andreas Fabri 2c2e26f07e Include CGAL/unary_function.h 2017-10-04 13:36:00 +01:00
Michael Vetter 154c48e8e3 Include OpenGL ES for arm
If we compile CGAL with having Qt present on arm, Qt will use OpenGL ES
headers. But CGAL/gl.h includes specifically include <GL/gl.h> which are
the desktop headers. They cannot be mixed.
2017-09-27 15:59:28 +02:00
Sebastien Loriot cd085f8880 Merge pull request #2369 from MaelRL/P2T2-Add_alpha_shapes-GF
Periodic_2_triangulation_2: Add support for alpha shapes
2017-09-27 15:49:13 +02:00
Laurent Rineau f8c5efb9e3 Merge pull request #2373 from sgiraudot/Classification-GF
Classification (new package)
2017-09-22 15:18:52 +02:00
Laurent Rineau bac0452224 Merge branch 'releases/CGAL-4.11-branch' 2017-09-18 16:53:29 +02:00
Laurent Rineau 52f8481d44 Prepare CGAL-4.11 2017-09-18 16:52:24 +02:00
Laurent Rineau 037cba3fae Merge pull request #2336 from maxGimeno/Detect_features-GF
PMP: Detect features
2017-09-18 14:29:55 +02:00