Commit Graph

657 Commits

Author SHA1 Message Date
Laurent Rineau a06d390fd4 Merge pull request #2910 from luis4a0/Algebraic_kernel_d-RS_MPFR_compatibility-Luis
Algebraic kernel d RS-Fix compatibility of MPFR, MPFI and RS.
2018-03-09 18:41:16 +01:00
Luis Peñaranda a8c8d6f152 Fix MPFR/MPFI check when MPFI is not present. 2018-03-08 10:05:26 -03:00
Luis Peñaranda ec8ddadac8 Check that MPFR/MPFI versions match.
MPFI >=1.5.2 only works with MPFR >=4.0.0.
MPFI < 1.5.2 only works with MPFR < 4.0.0.
This check is performed at CMake level, when configuring MPFI.
2018-03-08 10:12:42 +01:00
Laurent Rineau 3768e905ae Fix CGAL_ENABLE_CHECK_HEADERS
List of the fixes:

- The headers from the .cpp files were not processed (wrong regular
  expression for `awk`),

- `CGAL_COMPUTE_DEPENDENCIES` is now removed (unified with
  `CGAL_ENABLE_CHECK_HEADERS`).

- All `dependencies` files has an empty line (because of
  `include/CGAL/version.h` in the build directory).

- Fix the name of the target `pkg_<package>_deps`
2018-03-06 18:43:39 +01:00
Laurent Rineau c64596903d Set the default value of CGAL_DEV_MODE from the env variable
If the environment variable `CGAL_DEV_MODE` is set to a "true" value,
according to CMake, then the `CGAL_DEV_MODE` CMake option is `ON` by
default.

https://cmake.org/Wiki/CMake/Language_Syntax#CMake_supports_boolean_variables.

> CMake considers an empty string, "FALSE", "OFF", "NO", or any string
> ending in "-NOTFOUND" to be false. [..] Other values are true.
2018-02-21 15:32:56 +01:00
Laurent Rineau e6967d0887 Merge pull request #2846 from lrineau/Installation-fix_CGAL_HEADER_ONLY-GF
Fix CGAL_HEADER_ONLY
2018-02-19 14:28:43 +01:00
Laurent Rineau 7e8e70a005 Merge pull request #2799 from lrineau/Installation-Add_CGAL_DEV_MODE-GF
Add CGAL_DEV_MODE
2018-02-19 14:27:33 +01:00
Laurent Rineau 9b06a70e91 Merge pull request #2819 from afabri/CGAL-remove_SCL_SECURE_NO_DEPRECATE-GF
Address the warning concerning SCL_SECURE for VC++
2018-02-19 14:26:23 +01:00
Laurent Rineau dd739cd31b Do not declare the target CGAL_Qt5_moc_and_resources when useless
- .. if `CGAL_HEADER_ONLY` is not true,
- or if CMake is configuring CGAL "libraries".
2018-02-15 15:52:38 +01:00
Laurent Rineau 4e0cc55e4c Fix the CMake error
CMake does not like that the documentation of a CMake cache variable is
multiline. That triggers an error once the cache is re-loaded, the second
time.
2018-02-14 16:23:19 +01:00
Laurent Rineau 9a80f5ddd8 Merge pull request #2800 from jasjuang/master
prevent GCC flags propagating to NVCC, fixes #2775
2018-02-14 15:34:23 +01:00
jasjuang de47e36dac prevent GCC flags propagating to NVCC, fixes #2775 2018-02-09 09:46:50 -08:00
Andreas Fabri abe933a684 Address the warning concerning SCL_SECURE for VC++ 2018-02-09 15:00:14 +00:00
Maxime Gimeno a481d2651c Clean-up 2018-02-09 10:25:39 +01:00
Laurent Rineau 69ca424c5e Add CGAL_DEV_MODE 2018-02-06 15:08:54 +01:00
Maxime Gimeno 533fa91f41 remove classic package installation becaus eit is supposed to happen in install.sh 2018-02-02 12:08:05 +01:00
Maxime Gimeno 21745bea1e Ignore packages without dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 1dc6a0d66c Add a script in Scripts/developers_scripts thatcheck if there are differencies in the dependencies of packages 2018-02-02 12:08:05 +01:00
Maxime Gimeno d577ee75a1 remove Build Dir from dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno 9fc057e1cf remove list and list generator for documented headers and make compute_dependencies implied by enable_check_header 2018-02-02 12:08:05 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Maxime Gimeno 11a7f9720f get the list of documented headers at configuring time 2018-02-02 12:04:21 +01:00
Laurent Rineau 25c01d485c Merge pull request #2773 from maxGimeno/Mesh_IO-Fix_c3t3_plugin-GF
Polyhedron demo: Fix c3t3 IO plugin when used with TBB
2018-01-31 18:30:20 +01:00
Laurent Rineau 67f4ab82af Merge pull request #2723 from MaelRL/PMP-Graph_partition-GF
BGL Small feature: Graph partitioning
2018-01-31 18:29:59 +01:00
Maxime Gimeno f46e805c77 Make inherit the usage of TBB in the cmake macro 2018-01-30 14:09:47 +01:00
Laurent Rineau e8fca04385 Merge pull request #2691 from lrineau/Installation-fix_Boost_thread_required_or_not-GF
Installation: fix the detection of C++11 and the need for Boost Thread
2018-01-17 10:42:09 +01:00
Laurent Rineau e2f89318e5 Improve scripts 2018-01-11 16:52:35 +01:00
Mael Rouxel-Labbé 17e46dab7d Added partition operations to BGL 2018-01-09 18:06:02 +01:00
Laurent Rineau 42b11ddf29 Revert the merge of PR #2478
This reverts the merge commit 46cc91e787 onto
488c3e2879.
2018-01-04 17:54:08 +01:00
Laurent Rineau c08329e93f Fix the use of Boost, on Windows
Now the branch requires CMake>=3.5. For CMake between 3.1 and 3.4,
included, it is not possible to compile CGAL libraries using C++11 or
later, and then compile a user program with C++03.
2018-01-04 11:45:40 +01:00
jasjuang 374bd7e223 fix incorrect INTERFACE_INCLUDE_DIRECTORIES 2018-01-02 08:06:13 -08:00
Laurent Rineau 1016c43195 Fix detection of Boost.Thread vs. C++11
This allows to build CGAL non-header-only with C++11, and then use C++03 is
a user-project: the need for Boost.Thread is reevaluated.
2017-12-19 15:56:30 +01:00
Laurent Rineau 02d7260dc1 Store the detection of C++11 in a CMake global property
That avoids to re-detecting it again and again.
2017-12-19 15:56:02 +01:00
Laurent Rineau e80136e750
Merge branch 'master' into Aos_2-surface_sweep-efif 2017-12-07 15:00:47 +01:00
Efi Fogel f1483cfa25 Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
Merging Sebastien's fix to the surface-sweep cod.
Also, replaced all occurrences of '_SL_' with '_SS_'.
2017-12-07 15:56:00 +02:00
Laurent Rineau 163a90b6c1 Fix `make install` in header-only
Now the Qt5 resources (qrc files, icons) are installed along with the
CMake modules.
2017-12-07 11:34:00 +01:00
Laurent Rineau 777717ba7e Move config/ to cmake/modules/config/
That way, the directory will be installed along with CMake modules.
2017-12-06 12:53:05 +01:00
Laurent Rineau 4343b756f0 Merge pull request #2636 from maxGimeno/Add_make_install_tests-GF
Test make install in travis

# Conflicts:
#	Installation/cmake/modules/CGAL_Macros.cmake
2017-12-05 18:25:59 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau 477b12dd83 Hack for the CGAL test suite (cont.)
Follow-up to:
> commit 249aed9fd1
> Author: Laurent Rineau <laurent.rineau@cgal.org>
> Date:   Thu Nov 23 17:06:21 2017 +0100
>
>     Hack for the CGAL test suite
2017-11-30 11:15:38 +01:00
Laurent Rineau 5c7958dc08 Improve CGAL_target_use_TBB
The use of TBB by a target is private.
2017-11-30 11:12:11 +01:00
Andreas Fabri ea95e2b2eb CGALConfig.cmake changes the CMAKE_MODULE_PATH
Maybe a temnporary "solution".

Laurent Rineau
2017-11-30 10:07:53 +00:00
Laurent Rineau a2c513f080 QGLviewer depends on the lib GLU 2017-11-29 11:17:31 +01:00
Laurent Rineau 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Laurent Rineau 4267df0a78 Fix get_dependency_version(..) when CGAL is installed
.. That is not really a fix, but any I plan to remove that code soon or
later!
2017-11-28 14:13:31 +01:00
Laurent Rineau 0f63e872c1 Fix when Qt5 is not found 2017-11-28 10:28:50 +01:00
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