39cb35b134
Avoid CMake errors with CMake<=3.4
2017-10-31 13:37:43 +01:00
a335b979f2
Include the file only once, in a all-CGAL build
2017-10-20 17:02:15 +02:00
6fbfc14241
Merge pull request #2399 from lrineau/CGAL-ease_cross_compilation-GF
...
Ease the cross-compilation (to Android for example)
2017-09-07 17:20:24 +02:00
08676e21fa
Do not test the files config/testfiles/*.cpp while cross-compiling
2017-09-06 16:52:33 +02:00
e00851da24
Merge pull request #2357 from sloriot/CMake-install_var_relative
...
Make install paths relative as documented
2017-08-28 12:50:36 +02:00
156c374edb
make install path relative as documented and not absolute
2017-08-22 10:20:49 +02:00
da4b2632c9
Prepare master for CGAL-4.12
2017-08-01 15:21:41 +02:00
1b41c582ba
Merge pull request #2306 from lrineau/Installation-fix_link_errors-GF
...
Fix link errors in the building of the Debian packages
2017-07-28 18:29:38 +02:00
15fb0069cc
Fix link errors in the building of the Debian packages
...
- The Debian package uses `-DCGAL_ENABLE_PRECONFIG=OFF` and
`WITH_GMPXX=ON`. In that setup, GMPXX must in the "essential" 3rd
party libraries.
- The CGAL_Core library must be linked with its
dependencies (compilation error with `-zdefs`).
2017-07-26 16:57:19 +02:00
b6dc43f239
Prepare `master` for CGAL-4.11
2017-04-27 10:25:06 +02:00
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
cf987b51ba
Skip Three headers if QGLViewer is missing
2017-04-14 17:41:10 +02:00
6493e66e72
Better use of CMP0057, to support CMake<3.3
2017-04-14 17:14:43 +02:00
f05ee0d890
Fix the detection of packages directories
2017-04-13 15:14:53 +02:00
e1e90924a8
Allow to configure/build all CGAL with step_2
...
If `CGAL_HEADER_ONLY_STEP_2` is `TRUE`, then a build of CGAL with
`WITH_demos`, `WITH_examples` will succeed.
2017-03-27 18:04:54 +02:00
bac7c694bc
Restore the creation of <CGAL/compiled_config.h>
2017-03-27 18:04:52 +02:00
70a6bf5ef9
CMake-2.8.12 is now required
2017-03-27 17:23:27 +02:00
5725835fc3
Fix a bug
...
Do not add non-existent directories to `CGAL_INCLUDE_DIRS`.
CMake-3.5.2 complains about that in header-only.
2017-03-27 17:23:27 +02:00
ff15d0e5fc
Simplify the CMakeLists.txt of our libraries
2017-03-27 17:23:26 +02:00
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
beb882981c
Fix for CMake-2.8.11 and CMake-2.8.12
2016-10-06 18:18:50 +02:00
420ba84b70
Deal with OpenMesh
2016-10-06 10:21:25 +02:00
223c1cf5a4
Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
...
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
004dac6226
Merge pull request #1469 from lrineau/CGAL_ImageIO-better_read_raw-lrineau
...
better _readImage_raw()
2016-10-05 13:02:22 +02:00
bc03fae86c
Add a whitelist
...
For now, `<CGAL/Linear_cell_complex_constructors.h>` is skipped.
2016-09-30 15:23:15 +02:00
e4d19ff0eb
Better output for dependencies
...
Now the output is in `BUILDIR/package_info/*/`.
2016-09-30 15:23:15 +02:00
367da380f1
Move and regenerate list_of_documented_headers.cmake
2016-09-30 15:23:15 +02:00
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
7fe5258c7f
Handle the dependencies
...
- QGLViewer
- Eigen3
- VTK
- Qt5 modules
2016-09-30 15:22:29 +02:00
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
867328fce5
Use CMAKE_CXX_FLAGS
2016-09-30 15:22:27 +02:00
ed680537c9
WIP: compute packages dependencies, using the compiler
2016-09-30 15:22:26 +02:00
4707b2ed29
Merge pull request #1443 from TManhente/master
...
Adds CMake package version file generation
2016-09-23 16:52:13 +02:00
37e138b252
CTest in branch builds
2016-09-20 10:53:20 +02:00
dc3c7a5c1c
better _readImage_raw()
2016-09-16 17:07:13 +02:00
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
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
4a8602b49e
Set CMP0056 if CMake>=3.2
2016-07-27 16:26:55 +02:00
2cd9a15bb9
Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch'
...
Merge the following merge commits:
> 12b92f5#1271 from lrineau/Mesh_3-distance_criterion_sizing_field-GF
> 9c3d0b0#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
c65d3abe17
Add support for CTest
2016-07-21 14:42:35 +02:00
46463202cb
By default, CGAL_HEADER_ONLY is OFF.
2016-07-04 10:40:04 +02:00
4165a5a312
Replace the test on policy 0043 by a test on the cmake major version.
2016-06-28 12:18:07 +02:00
10cadcb985
Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD
2016-06-24 17:05:40 +02:00
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
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
6e92eafab7
Enable header only by default (for testing)
2016-06-05 20:49:48 +02:00
10469f9c4e
Update with master
2016-05-25 10:58:55 +02:00
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
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
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
fd4e0a51cc
Fix the SOVERSION
...
(Partially reverts commit 79f54a6c7c3af0a1aa1a6e845990fd06f950f63b.)
2016-03-29 12:10:37 +02:00
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
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
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
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
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
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
700da4729b
Remove install command removed in a previous commit and reintroduce here by a wrong resolved.
2016-03-09 12:50:18 +01:00
dd3ed5b07c
Remove the "S" from HEADERS_ONLY
2016-03-09 10:58:55 +01:00
94f2565c6a
Replace the name of the variable to enable header only mode in CGAL_HEADERS_ONLY
2016-03-09 10:56:11 +01:00
d56092753a
Make enable_header_only option persistent
2016-03-09 10:35:21 +01:00
f5baf48d5e
Do not export cgal in header only mode
2016-03-09 10:32:32 +01:00
19c28de969
Add option to enable cgal header only.
2016-03-09 10:20:05 +01:00
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
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
c72cc9fa8a
Remove outdated variables
2016-02-16 17:02:56 +01:00
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
3b63763f5d
Introduce CGAL_DOC_VERSION
2016-02-11 15:37:20 +01:00
aea00e0519
./doc/ is not shipped in public tarballs
2016-02-10 18:54:59 +01:00
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
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
a66b5d5a09
Use doc/CMakeLists in a release
2015-12-10 17:05:51 +01:00
eb4f860f3b
remove mentions of Qt3
2015-10-05 15:19:58 +02:00
dea9451c53
Move the add_config_flag macro to where it is used
2015-08-05 14:56:09 +02:00
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
e598d67ba6
CONFIG_CXX_FLAGS is no longer used
2015-08-05 14:56:09 +02:00
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
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
5cf0951577
Whitespace fixes
2015-08-05 14:56:08 +02:00
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
a25705527e
Merge pull request #212 from lrineau/Installation-CMP0054_OLD-GF
...
Remove the warning about CMP0054
2015-07-30 17:58:02 +02:00
a6b6105a7f
Remove the warning about CMP0054
...
That is temporary.
2015-07-29 15:44:21 +02:00
e72e89971d
Bump SOVERSION to 11.0.1 (no change)
2015-07-29 15:33:16 +02:00
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
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
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
e5bcdc5f3e
Update all CMakeLists.txt
...
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
33a1fdbcbc
Replace CGAL_LIBRARY with the actual CGAL target
...
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
2015-07-03 12:30:23 +02:00
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
ba9cf09f03
Do not compute ${lib}_LIBRARY_INSTALLED anymore
...
CGALConfig_installed.cmake does not use that variable anymore
2015-06-29 16:36:50 +02:00
f0082c20f4
To not check for the actual CMAKE_BUILD_TYPE
...
If CMAKE_BUILD_TYPE is not set in the initial run, is only
defined *after* this code is run. Since the build type is cached this
seemed to work when a cmake cache was already present, but not without.
2015-06-24 11:39:47 +02:00
3e0ce823ca
Do not compute ${LIBRARY_NAME}_LIBRARY anymore
...
Fixes #47
2015-06-23 17:59:48 +02:00
8f7e338f33
Create a build-tree and installation export file
...
Add an export-name to libraries created with collect_cgal_library and
use it in install(EXPORT). Fake the behavior of export(EXPORT) by
looking for created targets manually.
2015-06-23 16:27:58 +02:00
1ce3c68ec8
Remove the -g flag in testsuites
...
While it might seem cleaner to simply add the -g0 argument, removing -g
is safer: -g0 would need to be added after any possible -g flags. Since
CMake makes no guarantees how the COMPILE_OPTIONS of a target are
actually initialized and we cannot change them on an individual basis
this is not easy to achieve. Hence we strip the CXX_FLAGS of -g. This
also still allows specifying it manually through CGAL_CXX_FLAGS.
2015-06-08 11:17:09 +02:00
cb385a771b
Add -frounding-math for gcc 4 *and later*
...
Fix issue #104
2015-06-03 10:44:18 +02:00
040458d248
Update of all the CMakeList and .cmake files for Qt5
...
Reasy for merging the cpp files from clone qt5
2015-03-30 15:34:17 +02:00
52c4437539
This branch needs to bump the SONAME
2014-10-20 14:41:14 +02:00
58e1779c1e
Prepare future final release 4.5
2014-08-29 15:22:35 +02:00
311b505cad
Update the comment about the SOversion
...
Trivial fix for master
2014-08-18 15:35:17 +02:00
926aa7500f
Set CMP0042 to OLD
...
That avoids a warning on MacOS.
2014-07-22 15:14:52 +02:00
Laurent Rineau
Sébastien Loriot
Andreas Fabri
Thiago M. de C. Marques
Guillaume Damiand
Marvin Schmidt
Clement Jamin
Philipp Möller
Maxime Gimeno