Commit Graph

77749 Commits

Author SHA1 Message Date
Laurent Rineau d44f144a90 Restore the missing file 2017-11-27 10:18:42 +01:00
Laurent Rineau 249aed9fd1 Hack for the CGAL test suite 2017-11-23 17:06:47 +01:00
Laurent Rineau ce9399d423 Display compiler and linker flags 2017-11-23 17:06:46 +01:00
Laurent Rineau 9eb2e30745 Deal with the macro CGAL_TEST_SUITE in header-only 2017-11-23 17:06:46 +01:00
Laurent Rineau a2a5ca91a1 Unify CGAL_HEADER_ONLY and CGAL_HEADER_ONLY_STEP_2 2017-11-23 17:06:46 +01:00
Laurent Rineau bec5f9aae1 Cosmetic change of the message of the signal handler on Windows 2017-11-23 17:06:46 +01:00
Laurent Rineau 21b9a2177d Do not use the CGAL-components syntax for GMP, MPFR, MPFI, and RS3 2017-11-23 17:06:46 +01:00
Laurent Rineau c0ad644269 Correct syntax for target_compile_definitions 2017-11-23 16:41:21 +01:00
Laurent Rineau 4e78c4e10d header-only: do not define unwanted CGAL components 2017-11-22 13:02:04 +01:00
Laurent Rineau 876e4f8321 Rename CGAL_Qt5_extras to CGAL_Qt5_moc_and_resources 2017-11-22 13:01:06 +01:00
Laurent Rineau e8a40c535e Do not export targets in header-only
...they are just defined in `CGALConfig.cmake`.
2017-11-22 12:46:44 +01:00
Laurent Rineau 19c5502ca8 Fix compilation of demos in non-header-only
Now the variables `CGAL_Qt5_MOC_FILES` and `CGAL_Qt5_RESOURCE_FILES` are no
longer used by the definition of `CGAL_Qt5_extras`: other names are used.

`CGAL_Qt5_extras` is not supposed to be used directly by
users/examples/demos' `CMakeLists.txt`.
2017-11-22 12:45:21 +01:00
Laurent Rineau bc36af5eed Fix CMake warnings about mixed usage of target_link_libraries
See https://cmake.org/cmake/help/v3.0/policy/CMP0023.html
2017-11-22 11:06:26 +01:00
Andreas Fabri 021b340509 Fix CGAL_Qt5
In non-header-only, the resources and MOC files are added directly to
the CGAL_Qt5 library.
2017-11-22 09:59:52 +00:00
Andreas Fabri 1a76bd66d9 In fact only include_directories is needed 2017-11-22 08:49:56 +00:00
Andreas Fabri 08d6a078b1 fix CMakeLists.txt of test/TDS_3 2017-11-22 07:24:43 +00:00
Laurent Rineau 18caaba64d Fix the "-fp-model strict" for Intel
`-fp-model strict` is two arguments, not one!

```
[  4%] Building CXX object src/CGAL/CMakeFiles/CGAL.dir/all_files.cpp.o
cd /home/cgal_tester/build/src/cmake/platforms/CentOS7-ICC-2016-Release/src/CGAL && /opt/intel/compilers_and_libraries_2016.4.258/linux/bin/intel64/icpc   -DCGAL_EXPORTS -I/home/cgal_tester/build/src/cmake/platforms/CentOS7-ICC-2016-Release/include -I/mnt/testsuite/include  -w1 -O3 -DCGAL_NDEBUG -fPIC   "-fp-model strict" -o CMakeFiles/CGAL.dir/all_files.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/CentOS7-ICC-2016-Release/src/CGAL/all_files.cpp
icpc: command line warning #10159: invalid argument for option '-fp-model'
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.12-Ic-97/Installation/TestReport_lrineau_CentOS7-ICC-2016-Release.gz
2017-11-21 13:51:24 +01:00
Laurent Rineau fe139a8a7a Fix a typo 2017-11-21 09:51:55 +01:00
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 e3bc760374 Fix compilation 2017-11-17 15:17:19 +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 25dffa1710 Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED 2017-11-17 12:54:13 +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 49a138a9a4 Fix compilations of Polyhedron demo 2017-11-15 21:36:37 +01:00
Laurent Rineau 379f5b3bb3 Remove unused module 2017-11-15 19:44:26 +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 14e7091e1c Remove the need for the Qt5 Xml and Svg libraries 2017-11-14 14:09:37 +01:00
Laurent Rineau fe24a4db68 Explicit the dependencies of QGLViewer 2017-11-14 14:08:55 +01:00
Guillaume Damiand 6b300501aa T3 demo does not need script 2017-11-14 11:13:17 +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
Guillaume Damiand 7e57a9acd4 Add Svg module in polyhedron demo 2017-11-13 21:01:56 +01:00
Clement Jamin e2a1dd87ff Add SVG component 2017-11-13 17:57:33 +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 9b72ed0b47 Fix a warning 2017-11-13 12:04:10 +01:00