Commit Graph

274 Commits

Author SHA1 Message Date
Laurent Rineau 37e138b252 CTest in branch builds 2016-09-20 10:53:20 +02: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
Philipp Möller ecb34b3031 Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT
Do not add it to Config.cmake files anymore and remove it from the
interface
2016-02-16 17:20:22 +01:00
Philipp Möller c72cc9fa8a Remove outdated variables 2016-02-16 17:02:56 +01:00
Philipp Möller 1a68a004c1 Split *Export.cmake files
Note that the build tree still uses a single CGALExports.cmake file,
while for each library a special export file is installed.
2016-02-16 17:02:56 +01:00
Philipp Möller 3b63763f5d Introduce CGAL_DOC_VERSION 2016-02-11 15:37:20 +01:00
Laurent Rineau aea00e0519 ./doc/ is not shipped in public tarballs 2016-02-10 18:54:59 +01:00
Andreas Fabri 1f0e8324a3 Fix the name of libraries, on Windows
If CGAL_FULL_VERSION is not set in the cache, in the sub-directory src/ its value is empty. That creates wrong  library names, on Windows, such as:
  libCGAL_ImageIO-vc120-mt-.lib
2016-01-12 12:15:52 +01:00
Philipp Möller 5349ee4dfc Move CGAL_FULL_VERSION to PARENT_SCOPE
This variable is more sensible to be used in documentation. The
corresponding set in non branch-build does not require a PARENT_SCOPE,
because it has no parent in the release layout.
2015-12-17 16:00:06 +01:00
Philipp Möller a66b5d5a09 Use doc/CMakeLists in a release 2015-12-10 17:05:51 +01:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Philipp Möller dea9451c53 Move the add_config_flag macro to where it is used 2015-08-05 14:56:09 +02:00
Philipp Möller f0fad560f6 Remove unnecessary add_config_flag call
This call to add_config_flag has no effect. It is made before the
file(WRITE ${CMAKE_BINARY_DIR}/include/CGAL/compiler_config.h ...) which
overwrites the contents of the file.

This is surely a bug, because ${CGAL_EXT_LIB_${lib}_PREFIX} expands to
things like GMP or MPFR which would be really bad defines.
2015-08-05 14:56:09 +02:00
Philipp Möller e598d67ba6 CONFIG_CXX_FLAGS is no longer used 2015-08-05 14:56:09 +02:00
Philipp Möller de403e8cc4 Always run the config tests
The code tried to prevent running the config tests to often by caching
their values and only rerunning them when the CMAKE_CXX_FLAGS change.

While this is smart it only buys us a few seconds and is not actually
correct. One of those bugs could be triggered through linker flags or
debug flags as well and just checking CMAKE_CXX_FLAGS is far from
enough. To be on the safe side we accept the extra
configuration-time (which is usually also minimized by using compiler
caches).

This also removes a warning caused by CMake policy CMP0054.
2015-08-05 14:56:09 +02:00
Philipp Möller 8e5f887765 Prevent triggering of CMP0054
CMAKE_CXX_COMPILER_ID can expand to the string MSVC, which is also a
variable name which has been expanded by before CMP0054 has been
introduced.

This would lead to a bug *if* we would MATCHES against the string "MSVC",
but only triggers a warning.

Also quote some implicit string in a MATCHES for style reasons.
2015-08-05 14:56:08 +02:00
Philipp Möller 5cf0951577 Whitespace fixes 2015-08-05 14:56:08 +02:00
Philipp Möller 9b988404bf Set CMP0054 to NEW
We set it to new by removing the code that sets it to OLD.
2015-08-05 14:56:08 +02:00
Laurent Rineau a25705527e Merge pull request #212 from lrineau/Installation-CMP0054_OLD-GF
Remove the warning about CMP0054
2015-07-30 17:58:02 +02:00
Laurent Rineau a6b6105a7f Remove the warning about CMP0054
That is temporary.
2015-07-29 15:44:21 +02:00
Laurent Rineau e72e89971d Bump SOVERSION to 11.0.1 (no change) 2015-07-29 15:33:16 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 9550a41b67 Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
Add a CGALExports.cmake file

Conflicts:
	GraphicsView/src/CGAL_Qt5/CMakeLists.txt
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in

There was also a conceptual conflict in:
	Installation/src/CMakeLists.txt
2015-07-10 14:03:20 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00