3ff09bc549
Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
...
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
7cff890473
Change the installation of CGALConfig.cmake
2017-11-15 14:45:23 +01:00
e17736a9d9
Change the default INSTALL_CMAKE_DIR
2017-11-15 14:30:43 +01:00
86fb40832a
Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
...
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
c6068691fa
Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
...
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
abd9616231
Hide the CMake option we added for "step 1"
2017-11-13 10:09:22 +01:00
62c70d41ca
Renew the handle of policies, for CMake-3.10
...
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.
`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
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
4d468d1881
Add compatibility with CMake 3.0
...
Trivial bug-fix for master
2014-07-22 12:47:59 +02:00
6ed1ba826e
Merge branch 'to-be-tested/Stop_testing_taucs-sloriot'
...
Taucs, Lapack and Blas supports are no longer tested
Approved by the Release Manager
Tested in CGAL-4.5-Ic-97
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-07-16 20:19:21 +02:00
b6aeb7cc66
Store CGAL_DISABLE_GMP in CGALConfig.cmake...
...
... and use it in UseCGAL/CGAL_Macros, to avoid re-enabling GMP by
error.
2014-07-09 15:39:44 +02:00
ab9af1fda9
Nasty trick to make sure <gmp.h> is not used with CGAL_DISABLE_GMP
2014-06-26 19:12:30 +02:00
aeb094e4cc
more Taucs removal
2014-06-25 15:58:37 +02:00
0230e979e2
Merge branch 'CGAL-use_leda-GF-OLD' into CGAL-use_leda-GF
...
Conflicts:
Arrangement_on_surface_2/test/Arrangement_on_surface_2/construction_test_suite_generator.cpp
Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp
Documentation/doc/Installation.txt
Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
2014-06-18 22:50:06 +02:00
e754509e2a
Beginning of development of CGAL-4.5
2014-04-04 10:49:13 +02:00
2c1f3332c9
SOVERSION for CGAL-4.4
2014-02-06 20:02:03 +01:00
c919a9f387
Follow-up to "Hide the variables CGAL_*_PACKAGE_DIR"
...
This is a followup-up to the following commit:
| commit 16d42c0adf
2013-08-22 16:07:27 +02:00
f7d3eaab2a
Remove a CMake warning when building from the release tarball
...
== Setting paths ==
-- Build CGAL from release in directory CGAL-4.3-beta1
CMake Warning (dev) at CMakeLists.txt:99 (set):
Cannot set "CGAL_CONFIGURED_PACKAGES_NAMES": current scope has no parent.
This warning is for project developers. Use -Wno-dev to suppress it.
The reason is that in the release there is not parent directory. As that
cmake instruction is need only if the Doxygen documentation is there, I
have surrounded the corresponding line of code by:
if(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/Documentation")
endif()
2013-08-20 15:51:11 +02:00
16d42c0adf
Hide the variables CGAL_*_PACKAGE_DIR
...
Those three variables are for internal use only, and should not be exposed
to the users in the cmake cache:
CGAL_INSTALLATION_PACKAGE_DIR
CGAL_MAINTENANCE_PACKAGE_DIR
CGAL_CORE_PACKAGE_DIR
2013-08-20 15:47:00 +02:00
16cc269288
Change the SOVERSION to 10.0.2
2013-07-04 14:04:45 +02:00
4d9caf3763
Added names that were missing into the Doxyfile.in entries.
...
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +02:00
023e9714f3
Rescope CGAL_CONFIGURED_PACKAGES_NAMES
...
We need this variable in the Doxygen configuration process. Reset it
and change the scope to the parent scope.
2013-05-30 10:51:04 +02:00
2edb2bdfe7
REMOVE_ITEM does not work with an empty list
2013-03-17 15:21:18 +01:00
d1d70fdce7
CGAL_DISABLE_GMP can be set in the environment variables
2013-03-15 18:24:16 +01:00
92f464232a
Allow to add CGAL_DISABLE_GMP lately in the cache
2013-03-15 16:39:59 +01:00
02bb200fe5
Add a CMake variable that allows to disable GMP/MPFR
2013-03-15 14:11:34 +01:00
23ee26c658
With MSVC, add flags /wd4503 and /bigobj by default
...
/wd4503 disables the warning C4503 "decorated name length exceeded"
/bigobj is sometimes required, and the only flaw is the incompatibility
with MSVS before MSVS 2005.
2013-03-01 18:33:09 +01:00
316b09222e
Keep the SONAME for CGAL-4.2, and bump the build number of SOVERSION.
2013-02-26 17:08:08 +01:00
63212a0841
Revert "Bump CGAL SOVERSION to 11.0.0"
...
This reverts the following commit:
| commit a6b340ccf7
2013-02-26 17:05:34 +01:00
a6b340ccf7
Bump CGAL SOVERSION to 11.0.0
2013-02-25 18:38:33 +01:00
c7179b2c6c
Hide the CMake variable "WITH_tests" from the public releases
...
Trivial bug fix, that I have tested in both a public release and in a
branch build.
2013-02-22 13:20:25 +01:00
3d253a0edd
Add CGAL_GIT_HASH and provide defaults for all variables
2012-11-15 13:20:37 +01:00
7937e731d8
removed svn part, and added dummy SVN_CREATED_SVN_REVISION to be 99999
2012-11-13 15:51:37 +01:00
ac76a86278
Do check only headers in the include/CGAL directory.
...
Not in sub-directories.
2012-10-10 12:25:39 +00:00
f0118a1311
Revert last commit (commited by error)
2012-10-09 09:28:37 +00:00
648472bdac
After a run of detect_packages_license
2012-10-09 09:26:23 +00:00
7618e75092
Replace phony targets check_* by real targets
...
That way the check is not redone for file that already passed the check.
2012-10-05 12:58:58 +00:00
0a081c2abd
Add an option to check the syntax of headers, individually.
...
That feature can be enabled with g++, clang++, and icpc (intel). It could
be implemented for MSVC, with the flag /Zs, but that is not yet done (and
probably will not).
The option is controlled by a CMake option, CGAL_ENABLE_CHECK_HEADERS, that
is disabled by default. If that option is enabled by the user, then CMake
will check if the compiler $CXX understand the syntax:
$CXX -x c++ -fsyntax-only CGAL/header.h
and send an error otherwise.
Then phony targets will be created:
- a target check_CGAL__header_h for each header <CGAL/header.h>,
- a target check_pkg_<pkg> for each package <pgk>,
- and a target check_headers for the whole CGAL.
Those new targets currently give a lot of compilation errors if
CGAL_ENABLE_CHECK_HEADERS is enabled!
+ fix several missing includes in Mesh_2.
2012-10-05 12:21:44 +00:00
b1481c43c8
${lib} is now prefixed with name, which needed adaptions in loop
...
In addition: removed fake variable and thus simplified loop
(needed to rename CGAL_INSTALLED_${lib}_LIBRARY to ${lib}_LIBRARY_INSTALLED)
2012-09-12 14:26:02 +00:00
2db4effa7e
CMake: Fix the handling of cmake_policy
...
That is a followup-to my commit last year:
| ------------------------------------------------------------------------
| r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
|
| Try to fix my last revision about cmake_policy, with CMake-2.6.x
|
| CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
| x.y.z is greater than the current CMake version.
|
| ------------------------------------------------------------------------
The following check:
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
cmake_minimum_required(VERSION 2.6.2)
The script used to fix that was:
#!/usr/bin/env perl
$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
else()
cmake_policy(VERSION 2.6)
endif()
END
while(<>) {
if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
while(<>) {
if(/^endif\(\)/) {
print "$replacement";
while(<>) {
print;
}
exit 0
}
}
}
print;
}
2012-08-22 12:35:03 +00:00
8948b57807
revert quick fix for a problem with CGAL_ENABLE_PRECONFIG
...
When preconfig was disabled, UseFiles were not correctly
included because of a missing $ to indicate a variable
2012-08-22 09:05:31 +00:00
33af7ab5dc
Quick fix for CGAL_ENABLE_PRECONFIG: hide it
...
If CGAL_ENABLE_PRECONFIG is set to OFF, currently the CMake configuration
fails. That option is turned into an internal cache variable set to ON by
default.
2012-08-16 10:03:35 +00:00
05d65ffeae
Initial support for WITH_tests
...
That is only to compile tests, and not to launch a full testsuite!
2012-08-10 14:07:18 +00:00
b22a86c1c1
Fix the CGALConfig.cmake that is installed, on Windows
2012-08-03 15:38:26 +00:00
9491693417
Fix an issue when BUILD_SHARED_LIBS is toggled
...
When the value of the Boolean cache variable BUILD_SHARED_LIBS is modified,
there was a bug that the variable CGAL_LIBRARY_NAME,
CGAL_Core_LIBRARY_NAME, CGAL_Qt4_LIBRARY_NAME, and so on, were not
updated. As a consequence, the file CGALConfig.cmake produced in the
installation directory was not correct: it was referring to .so files
whereas the installed binaries were .a files, or the reverse.
This patch fixes the issue.
2012-07-27 13:16:55 +00:00
a9cb96b42a
Minor tweak to CMake messages during CGAL configuration
...
Before that patch, CGAL_SetupFlags was included in the stage:
== Detect external libraries ==
Now there is a stage:
== Set up flags ==
2012-07-26 10:51:05 +00:00
397f0e4131
worked only if WITH_CGAL_Core=ON|OFF, but not if it's not given at all
2012-07-05 09:03:18 +00:00
1bb23e6b09
Cherry-pick hot fixes from CGAL-4.0-branch:
...
| ------------------------------------------------------------------------
| r70257 | lrineau | 2012-07-04 10:41:28 +0200 (Wed, 04 Jul 2012) | 1 line
| Changed paths:
| M /branches/releases/CGAL-4.0-branch/Installation/CMakeLists.txt
|
| Fix CMake error in public releases
| ------------------------------------------------------------------------
| r70259 | lrineau | 2012-07-04 11:22:12 +0200 (Wed, 04 Jul 2012) | 1 line
| Changed paths:
| M /branches/releases/CGAL-4.0-branch/Installation/CHANGES
| M /branches/releases/CGAL-4.0-branch/Installation/changes.html
|
| Update the changes.html
| ------------------------------------------------------------------------
2012-07-04 09:36:41 +00:00
a488660748
rely on CMake list(FIND ...) instead of macro
...
Macro is nicer to use, but needs to be included and is less efficient.
To improve understanding: added comments
2012-06-29 23:13:43 +00:00
d4cb1c2212
SetupDependicies needs also to check for essential lib (not just WITH_<lib>), side effect: mandatory->essential
2012-06-29 15:24:30 +00:00
455fcb0109
Add a comment for later
2012-06-28 15:15:31 +00:00
cccbcac26c
ensure that CGAL_USE_CORE is only defined when WITH_CGAL_Core=ON
...
in particular when WITH_CGAL_Core=OFF is shall not be defined
2012-06-27 13:57:55 +00:00
67291a2c6d
merge from next
2012-06-24 12:17:32 +00:00
5ed099f6c1
enable preconfig
2012-06-21 21:57:16 +00:00
7973423691
prefix is a variable
2012-06-21 14:54:17 +00:00
d67be721d4
write prefix exception into config file and use default one otherwise for find_package
2012-06-21 14:27:35 +00:00
0aba4d0010
Fix the parsing of the VERSION file
...
In case of a build from a release tarball, the parsing of the VERSION file
was not correct. This patch tries a better solution.
2012-06-21 10:34:46 +00:00
3fde316a6c
added CGAL_ENABLE_PRECONFIG (the default value has to be determined)
2012-06-20 11:16:17 +00:00
7a9557e414
fixed typo
2012-06-19 11:41:10 +00:00
ed88f4e0e2
added comments
2012-06-19 08:26:16 +00:00
70fbefe00f
fix for QGLViewer or QGLVIEWER (AHHHHHH!)
2012-06-14 16:56:36 +00:00
90e6f6bf0f
fix for ZLIB
2012-06-12 12:45:17 +00:00
35f5e9fa65
now Eigen3 is working (ahhh case-sensitive lib configuration ahhhh)
2012-05-29 15:18:01 +00:00
10d8114ed3
fix for Eigen
2012-05-28 08:05:24 +00:00
76ef5030ff
fix for Eigen3
2012-05-25 15:46:37 +00:00
41d3549414
typo LIRARIES->LIBRARIES
2012-05-25 11:10:54 +00:00
c9a1a5cbd3
added Eigen3
2012-05-24 08:44:45 +00:00
333bd56995
add lang C to main file
2012-05-24 08:28:00 +00:00
ab88be4751
clean up printed message to make it more consistent
2012-05-21 11:26:10 +00:00
60efbec2d3
merge from next
2012-05-20 11:50:30 +00:00
5d3bd1094c
In the testsuite, once the reference cache is loaded, unset some nasty
...
variables, such as eg. CGAL_Qt4_BINARY_DIR.
2012-04-13 07:55:43 +00:00
69208fc8f2
Increase the SOVERSION for CGAL-4.1
2012-03-12 16:20:14 +00:00
c2ab0cf770
Bug fix: WITH_CGAL_Core was ignored
...
There was an explicit
unset(WITH_CGAL_Core)
in the CMake scripts of CGAL. It was introduced to workaround an issue in
our testsuite process. I turned it into an EXCLUDE WITH_CGAL_Core in the
command load_cache that is used by our testsuite process.
2012-02-10 15:32:38 +00:00
ca9ddf0ca5
CGAL_BUGFIX_VERSION must not be empty (for the rc file on Windows)
...
When CGAL_BUGFIX_VERSION is empty, sets it to 0.
2012-02-07 16:51:38 +00:00
d38da06a26
Fix that patch:
...
| ------------------------------------------------------------------------
| r67597 | lrineau | 2012-02-03 18:13:17 +0100 (Fri, 03 Feb 2012) | 1 line
|
| Do not install scripts/cgal_create_assertions.sh scripts/cgal_create_cmake_script_with_options
| ------------------------------------------------------------------------
Use full-path for scripts.
2012-02-07 13:15:23 +00:00
df25f0aa17
Fix (examples|demo)/CMakeLists.txt
...
That way, those CMakeLists.txt can be used to build examples and demo from
outside the building of CGAL libraries.
2012-02-06 11:39:40 +00:00
058dbe631d
Do not install scripts/cgal_create_assertions.sh scripts/cgal_create_cmake_script_with_options
2012-02-03 17:13:17 +00:00
7b2e34d267
merge with next
2012-01-27 16:46:42 +00:00
4aafb6172c
Fix cmake_minimum_required()
...
Yesterday's patch was plainly wrong. I want CMake-2.8.6 on Windows, and
only CMake-2.6.x on Linux.
2012-01-27 14:48:23 +00:00
c81dd1c3c3
Require CMake>=2.8.6 on Windows platforms
2012-01-26 10:17:17 +00:00
284820786a
Bug fix: set CGAL_VERSION in branch-build
...
The variable CGAL_VERSION is used to initialize the value of the cache
variable CGAL_INSTALL_DOC_DIR.
2012-01-25 16:53:38 +00:00
e89cf2af9c
removed wrong line
2012-01-24 14:30:20 +00:00
a81362c2ce
added comment
2012-01-24 14:13:14 +00:00
832c6c02e7
merge from next; installation.tex got major changes
2012-01-23 13:54:58 +00:00
d27f1eec32
Allow branch-build+WITH_examples|WITH_demos on Windows too
...
Call bash /full/path/to/cgal_create_cmake_scripts now
2012-01-20 13:36:11 +00:00
9d3dffc06e
DO NOT IGNORE WITH_CGAL_Core
2012-01-19 13:41:30 +00:00
aa61eaa607
In dont_submit, also check for "demo" or "examples".
2012-01-18 18:29:07 +00:00
37af1861b3
Full-support of WITH_examples and WITH_demo in a branch-build
...
- Factorize the logic of Installation/examples/CMakeLists.txt and
Installation/demo/CMakeLists.txt in to a function defined in
Installation/CMakeLists.txt
- Call cgal_create_cmake_script, potentially out-of-build, when the
CMakeLists.txt does not exist.
2012-01-18 18:18:06 +00:00
c7a3e1e106
order: first essential, then optional
2012-01-17 12:40:57 +00:00
45d6ad938b
Remove LICENSE.QPL
2012-01-13 16:45:42 +00:00
fb7bbdb27f
cosmetics
2012-01-11 00:00:59 +00:00
809b15bef1
cleanup
2012-01-10 18:28:39 +00:00
9cd61d509c
let QT compile
2012-01-10 12:31:59 +00:00
2ff87cd2c6
improved formatting
2012-01-10 10:16:18 +00:00
66bc1cef1e
merge from next
2012-01-09 12:42:00 +00:00
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
a494f0d65c
merge from next
2011-11-17 14:18:37 +00:00
519ab4f40f
Do not use CGAL_INSTALLATION_PACKAGE_DIR with Subversion_GET_(URL|REVISION)
...
At the first run of CMake, CGAL_INSTALLATION_PACKAGE_DIR is not known when
Subversion_GET_REVISION and Subversion_GET_URL are called. That gives an
svn error, that is fixed at the second run of CMake. Use CMAKE_SOURCE_DIR
and CMAKE_CURRENT_SOURCE_DIR instead.
2011-11-17 14:12:19 +00:00
c4eb6ccaf0
Factorize the code between Subversion_GET_URL and Subversion_GET_REVISION
...
... into a new function Subversion_GET_INFO. The function
Subversion_GET_REVISION is also moved to <branch_root>/CMakeLists.txt
instead of <branch_root>/Installation/CMakeLists.txt, because that function
is used only in the case of a branch-build anyway.
2011-11-17 14:02:41 +00:00
3bfa2c96b6
Patch for Cygwin svn.exe
...
If the first call to svn returned an error, call cygpath first to get
the directory path, and call svn a second time on the result.
2011-11-17 10:10:12 +00:00
d5fb396c13
Use file(GLOB .. RELATIVE ..) to list packages
...
That seems a bit easier, and gives better log messages.
2011-11-08 15:03:22 +00:00
6ced1782d0
merge from next
2011-10-28 12:36:01 +00:00
3adb7877d3
Fix for testsuite
...
One does not want to load some CGAL_*_DIR variables from the reference
cache.
2011-10-28 12:17:37 +00:00
7c64fe7394
Add versioninfo to created DLLs.
2011-10-25 15:17:08 +00:00
a136c46405
Fix previous commit about new name mangling for Windows libraries
2011-10-21 14:46:12 +00:00
9059b29647
Fix and factorize post-build commands on Windows
...
The function build_cgal_library defined in
Installation/src/CMakeLists.txt now handles a lot more than before, to
factorize between the various */src/*/CMakeLists.txt files used to
build CGAL libraries.
For example, the definition of mangled names is now factorized in that
function.
Installation/src/CMakeLists.txt also sets the output directories for
runtime, shared libraries, and static libraries. DLLs will be created
in bin/ instead of lib/.
2011-10-17 16:02:12 +00:00
5fd463b2bb
Add LICENSE.GPL to the install target.
2011-10-13 14:16:49 +00:00
5946c69608
merge from next
2011-10-12 13:52:06 +00:00
677ae4c7f4
CMake variables created by the branch-build are marked as advanced
2011-10-12 13:50:17 +00:00
87148361ff
Rename CGAL_BUILD_SHARED_LIB to CGAL_BUILD_SHARED_LIBS
...
Better name, and more coherent with CMake variable name:
BUILD_SHARED_LIBS
2011-10-11 13:52:25 +00:00
aa00f78883
Also support the compilation of CGAL libraries as static libs, with MSVC.
2011-10-06 16:01:16 +00:00
b28fb2f764
Remove debugging messages
2011-10-06 09:51:48 +00:00
cbfe32ce37
Add declspecs for Visual C++ so that we can build dlls
2011-10-05 19:12:23 +00:00
428e097ddc
Bump the soversion of CGAL libraries in CGAL-3.10
2011-09-28 12:43:22 +00:00
dbf3ace24b
merge from next
2011-09-22 07:56:49 +00:00
e773e4b5a7
CGAL_VERSION_NR was incorrect in hotbuild since 3.10
...
Now that CGAL_VERSION_MINOR is 10 (two digits), the CGAL_VERSION_NR
variable was not filled correctly in hot builds. That revision fixes that
issue.
2011-08-17 11:07:56 +00:00
70661bc1ef
SONAME/SOVERSION should not be in the cache
2011-07-20 14:16:21 +00:00
dac5ec1feb
Bump SONAME for CGAL-3.9
2011-07-20 14:04:16 +00:00
771760b538
Add the piece of CMake code to detect the URL of the current SVN branch
...
(Still to-do for Git...)
2011-06-10 09:59:27 +00:00
1787a34308
redo config tests if CMAKE_CXX_FLAGS has changed
2011-06-08 07:21:38 +00:00
bcdc7c3771
merge from next
2011-04-28 21:35:58 +00:00
3c02e07b23
Try to fix my last revision about cmake_policy, with CMake-2.6.x
...
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
026e830dec
merge from next
2011-04-28 10:51:25 +00:00
4b795c56f4
Global handling of CMake policies
...
We declare
cmake_minimum_required(VERSION 2.6.2)
but we also use
cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.
That way, we no longer need any declaration of specific policies.
2011-04-28 10:33:17 +00:00
56c034b893
merge from next
2011-04-27 22:34:14 +00:00
5229c33964
Typo
2011-04-27 22:07:08 +00:00
2c81fa893d
Cosmetic: use lowercase for CMake commands, use functions instead of macros.
2011-04-27 21:24:29 +00:00
d827ed8d74
Add quotes in execute_process if the command name is a variable.
2011-04-27 21:16:42 +00:00
9274c3c09e
added todo
2011-04-26 09:26:46 +00:00
3dd1dec7a7
GMPXX only if not WIN32
2011-04-22 20:33:49 +00:00
1a4dbf894d
Avoid duplicates in CGAL_SUPPORTING_3RD_PARTY_LIRARIES when cmake is run
...
several times.
2011-04-22 16:20:42 +00:00
5f6ebda0cf
split RS3 from RS
2011-04-21 21:21:36 +00:00
6d0488eca3
merge from next
2011-04-21 14:28:02 +00:00
15b31230a7
added option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT
2011-04-21 14:25:13 +00:00
9bcf77ab04
fixed parsing of SVN_REVISION_NR for our french friends ;-)
2011-04-20 16:10:16 +00:00
db810b3c8c
mproved outout
2011-04-20 15:40:17 +00:00
72e82d7e9a
fixed usages for Prefix
2011-04-20 15:24:59 +00:00
e6b0ada67c
use correct prefix, handling of mandatory libs improved
2011-04-20 14:23:30 +00:00
2489f2d396
deal with library variable prefixes
2011-04-20 14:09:01 +00:00
fba0d339e7
cleanup
2011-04-20 10:17:01 +00:00
348e74b2ad
simplified external lib handling (not yet complete)
...
- clean up CGALConfig files (gmp/mpfr version)
- special role of LEDA
- gmp/mpfr need version
- removed SetupGMP ;-)
- clean up Dependencies
- NTL without USE_FILE
- added mandatory libs
2011-04-19 22:45:54 +00:00
28cd8fc2a6
added list of supporting 3rd party libs
2011-04-18 08:46:51 +00:00
863f0c4de5
enable preconfiguration for external libs (for now only NTL, RS, MPFI), others to come
2011-04-17 19:55:06 +00:00
eb7a5ed11e
branch-build is now HOT on next ;-)
2011-04-15 09:12:06 +00:00
d92ca456a1
Minor: add a precision in the message about old versions of icl
2011-03-30 09:25:33 +00:00
421ea1c87a
typo: fix the whitespace
2011-03-29 15:36:37 +00:00
bfc2b1be9a
Tweak for Intel on Windows.
2011-03-29 15:35:40 +00:00
684fd15bd3
Add comments near the CMake policy we set.
...
Set the new policy CMP0017 of CMake-2.8.4 to OLD.
2011-03-09 13:33:08 +00:00
2afac8aac9
Fix CMakeLists.txt, ligne 319: the variable ${CMAKE_INSTALL_PREFIX} must be
...
quoted. It can contain special characters. For example, on Windows Vista 64
bits, by default, it is "C:/Program Files (x86)/CGAL".
2011-03-03 09:59:53 +00:00
014b308bbd
Bump the SONAME of CGAL-3.8. I have seen that at least CGAL::Random in
...
CGAL-3.8 is not binary compatible with CGAL::Random in CGAL-3.7 (there is a
new field).
2011-03-02 11:37:13 +00:00
9f9015e318
(Merge the branch /branches/candidate-packages/Installation)
...
Patch to trunk/Installation/ to display the full version message of the
compiler, if RUNNING_CGAL_AUTO_TEST is set (in the testsuite). That will
help to know which compiler are run by tests platforms.
Display also the result of `uname -a`
2010-11-03 18:16:16 +00:00
Laurent Rineau
Clement Jamin
Sébastien Loriot
Andreas Fabri
Thiago M. de C. Marques
Guillaume Damiand
Marvin Schmidt
Philipp Möller
Maxime Gimeno
Ross Hemsley
Philipp Möller
Eric Berberich
Laurent Rineau
Sébastien Loriot