Commit Graph

296 Commits

Author SHA1 Message Date
Laurent Rineau b6dc43f239 Prepare `master` for CGAL-4.11 2017-04-27 10:25:06 +02:00
Laurent Rineau 860e7c564f Fix errors detected by Travis
- What happens when VTK is missing...
- `clang++ -syntax-only` is more picky than g++
2017-04-14 18:11:43 +02:00
Laurent Rineau cf987b51ba Skip Three headers if QGLViewer is missing 2017-04-14 17:41:10 +02:00
Laurent Rineau 6493e66e72 Better use of CMP0057, to support CMake<3.3 2017-04-14 17:14:43 +02:00
Laurent Rineau f05ee0d890 Fix the detection of packages directories 2017-04-13 15:14:53 +02:00
Sébastien Loriot eefa67f762 remove release_date.h and put the macro in version.h to be set by cmake
in the case of a release, it will be the date of the creation of the release
2017-01-19 16:32:31 +01:00
Laurent Rineau beb882981c Fix for CMake-2.8.11 and CMake-2.8.12 2016-10-06 18:18:50 +02:00
Laurent Rineau 420ba84b70 Deal with OpenMesh 2016-10-06 10:21:25 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 004dac6226 Merge pull request #1469 from lrineau/CGAL_ImageIO-better_read_raw-lrineau
better _readImage_raw()
2016-10-05 13:02:22 +02:00
Laurent Rineau bc03fae86c Add a whitelist
For now, `<CGAL/Linear_cell_complex_constructors.h>` is skipped.
2016-09-30 15:23:15 +02:00
Laurent Rineau e4d19ff0eb Better output for dependencies
Now the output is in `BUILDIR/package_info/*/`.
2016-09-30 15:23:15 +02:00
Laurent Rineau 367da380f1 Move and regenerate list_of_documented_headers.cmake 2016-09-30 15:23:15 +02:00
Laurent Rineau c76eec40b9 Deal with the IPE, RS, and LEDA dependencies
For RS and LEDA, it seems it does not work correctly.
2016-09-30 15:23:14 +02:00
Laurent Rineau 7fe5258c7f Handle the dependencies
- QGLViewer
- Eigen3
- VTK
- Qt5 modules
2016-09-30 15:22:29 +02:00
Laurent Rineau c6855beb15 Only check the list of documented headers
That list of documented headers (contained in
`Installation/list_of_documented_headers.cmake`) is generated using a
shell script, with `ack`, by searching in the example .cpp files, and in
the Doxygen compiled documentation.
2016-09-30 15:22:28 +02:00
Andreas Fabri 867328fce5 Use CMAKE_CXX_FLAGS 2016-09-30 15:22:27 +02:00
Laurent Rineau ed680537c9 WIP: compute packages dependencies, using the compiler 2016-09-30 15:22:26 +02:00
Laurent Rineau 4707b2ed29 Merge pull request #1443 from TManhente/master
Adds CMake package version file generation
2016-09-23 16:52:13 +02:00
Laurent Rineau 37e138b252 CTest in branch builds 2016-09-20 10:53:20 +02:00
Laurent Rineau dc3c7a5c1c better _readImage_raw() 2016-09-16 17:07:13 +02:00
Thiago M. de C. Marques 9c338ad61a Removes the copy of the package version file to the build config folder
See: https://github.com/CGAL/cgal/pull/1443#discussion-diff-78147435
2016-09-09 08:32:21 -03:00
Thiago M. de C. Marques a24dd7dd1c Adds CMake package version file generation
This allows clients to specify a minimum CGAL version in their CMake list files.
Eg.:

    find_package(CGAL 4.9)

More info: https://cmake.org/cmake/help/v3.6/manual/cmake-packages.7.html#package-version-file
2016-09-08 21:14:20 -03:00
Laurent Rineau 4a8602b49e Set CMP0056 if CMake>=3.2 2016-07-27 16:26:55 +02:00
Laurent Rineau 2cd9a15bb9 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch'
Merge the following merge commits:
> 12b92f5 Merge pull request #1271 from lrineau/Mesh_3-distance_criterion_sizing_field-GF
> 9c3d0b0 Merge pull request #1295 from lrineau/CGAL-add_test-GF

Conflicts:
	Maintenance/release_building/BUGFIX_NUMBER
	Maintenance/release_building/public_release_name
2016-07-22 18:31:02 +02:00
Laurent Rineau c65d3abe17 Add support for CTest 2016-07-21 14:42:35 +02:00
Guillaume Damiand 46463202cb By default, CGAL_HEADER_ONLY is OFF. 2016-07-04 10:40:04 +02:00
Guillaume Damiand 4165a5a312 Replace the test on policy 0043 by a test on the cmake major version. 2016-06-28 12:18:07 +02:00
Sébastien Loriot 10cadcb985 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD 2016-06-24 17:05:40 +02:00
Sébastien Loriot c951fe0fca Merge pull request #1035 from lrineau/CGAL-fix_Wconversion_warnings-GF
Fix -Wconversion warnings, and issues detected by those warnings
2016-06-24 13:30:48 +02:00
Guillaume Damiand d64f43ac73 The option CGAL_HEADER_ONLY is enabled only for cmake >= 3.0 (because in this case we use INTERFACE library) 2016-06-24 09:56:11 +02:00
Guillaume Damiand 6e92eafab7 Enable header only by default (for testing) 2016-06-05 20:49:48 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Laurent Rineau a96ec65c54 Sort results of file(GLOB ...) to make build deterministic
Patch from Joachim Reichel <reichel@debian.org>, adapted from the flat
layout to the Git layout.

Fix #1048.
2016-05-06 16:50:16 +02:00
Laurent Rineau 810538d221 Fix 32bits issues in ImageIO
Those issues were detected by the compilation flag `-Wconversion` of
g++-5.3.

That changes the ABI of CGAL_ImageIO.
2016-04-22 12:35:32 +02:00
Laurent Rineau 617d5f2856 Merge pull request #843 from afabri/Random_print_seed-GF
Print the seed of CGAL::default_random
2016-04-01 11:02:54 +02:00
Laurent Rineau fd4e0a51cc Fix the SOVERSION
(Partially reverts commit 79f54a6c7c3af0a1aa1a6e845990fd06f950f63b.)
2016-03-29 12:10:37 +02:00
Laurent Rineau 03f4859026 Merge pull request #931 from marv/cmake-arch-indenpendent-files
Include GNUInstallDirs and use CMAKE_INSTALL_* variables
2016-03-24 13:16:59 +01:00
Laurent Rineau 5b48eedf20 Merge pull request #790 from bo0ts/Installation-remove_ALL_PRECONFIGURED-pmoeller
Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT and associated code
2016-03-24 11:30:14 +01:00
Laurent Rineau 79f54a6c7c Bump the SOVERSION_MINOR
- With the addition of that new function Random::Random(char*), the ABI
  changes, but in a compatible way -> bump the minor version of
  SOVERSION. The SONAME remains unchanged.

- Add tests for `Random` with and without `CGAL_TEST_SUITE`. That will
  make a difference only with header-only, because at the time the tests
  are compiled, libCGAL is already compiled.
2016-03-23 11:27:33 +01:00
Marvin Schmidt 887fade6d7 Include GNUInstallDirs and use CMAKE_INSTALL_* variables
This allows installing the architecture-independent data outside the
prefix. This is particularly necessary on systems using a
multi-architecture layout where architecture-dependent files live in
/usr/${host_triple}/ and architecture-independent files in /usr/share.
2016-03-19 16:44:22 +01:00
Laurent Rineau e98bc7ebb5 I have tried to run CGAL demos from 4.8 with 4.7 libs
I am surprised that the branch 'header-only, step 0' did not break the
ABI! Good job, guys.
2016-03-18 15:32:35 +01:00
Laurent Rineau fd42bc1d15 Step 2
CGAL_ImageIO and CGAL_Qt5 are not even configured in header-only
mode. They will be configured later by `CGALConfig.cmake`.
2016-03-09 17:14:04 +01:00
Guillaume Damiand 700da4729b Remove install command removed in a previous commit and reintroduce here by a wrong resolved. 2016-03-09 12:50:18 +01:00
Clement Jamin dd3ed5b07c Remove the "S" from HEADERS_ONLY 2016-03-09 10:58:55 +01:00
Guillaume Damiand 94f2565c6a Replace the name of the variable to enable header only mode in CGAL_HEADERS_ONLY 2016-03-09 10:56:11 +01:00
Guillaume Damiand d56092753a Make enable_header_only option persistent 2016-03-09 10:35:21 +01:00
Guillaume Damiand f5baf48d5e Do not export cgal in header only mode 2016-03-09 10:32:32 +01:00
Guillaume Damiand 19c28de969 Add option to enable cgal header only. 2016-03-09 10:20:05 +01:00
Sébastien Loriot 45406a5296 Merge pull request #788 from bo0ts/Installation-split_config-pmoeller
Split CGALConfig.cmake and CGALExports.cmake
2016-03-06 15:36:55 +01:00