Commit Graph

243 Commits

Author SHA1 Message Date
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
Laurent Rineau 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
Philipp Möller 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
Maxime Gimeno 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
Philipp Möller 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
Philipp Möller 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
Philipp Möller 3e0ce823ca Do not compute ${LIBRARY_NAME}_LIBRARY anymore
Fixes #47
2015-06-23 17:59:48 +02:00
Philipp Möller 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
Philipp Möller 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
Laurent Rineau cb385a771b Add -frounding-math for gcc 4 *and later*
Fix issue #104
2015-06-03 10:44:18 +02:00
Maxime Gimeno 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
Laurent Rineau 52c4437539 This branch needs to bump the SONAME 2014-10-20 14:41:14 +02:00
Laurent Rineau 58e1779c1e Prepare future final release 4.5 2014-08-29 15:22:35 +02:00
Laurent Rineau 311b505cad Update the comment about the SOversion
Trivial fix for master
2014-08-18 15:35:17 +02:00
Laurent Rineau 926aa7500f Set CMP0042 to OLD
That avoids a warning on MacOS.
2014-07-22 15:14:52 +02:00
Laurent Rineau 4d468d1881 Add compatibility with CMake 3.0
Trivial bug-fix for master
2014-07-22 12:47:59 +02:00
Sébastien Loriot 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
Laurent Rineau 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
Laurent Rineau ab9af1fda9 Nasty trick to make sure <gmp.h> is not used with CGAL_DISABLE_GMP 2014-06-26 19:12:30 +02:00
Sébastien Loriot aeb094e4cc more Taucs removal 2014-06-25 15:58:37 +02:00
Sébastien Loriot 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
Laurent Rineau e754509e2a Beginning of development of CGAL-4.5 2014-04-04 10:49:13 +02:00
Laurent Rineau 2c1f3332c9 SOVERSION for CGAL-4.4 2014-02-06 20:02:03 +01:00
Laurent Rineau c919a9f387 Follow-up to "Hide the variables CGAL_*_PACKAGE_DIR"
This is a followup-up to the following commit:
  | commit 16d42c0adf
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Tue Aug 20 15:47:00 2013 +0200
  |
  |     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

Those variables are declared twice, in two 'if()'-branches. I forgot to
modify one copy of them.
2013-08-22 16:07:27 +02:00
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 16cc269288 Change the SOVERSION to 10.0.2 2013-07-04 14:04:45 +02:00
Ross Hemsley 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
Philipp Möller 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
Andreas Fabri 2edb2bdfe7 REMOVE_ITEM does not work with an empty list 2013-03-17 15:21:18 +01:00
Laurent Rineau d1d70fdce7 CGAL_DISABLE_GMP can be set in the environment variables 2013-03-15 18:24:16 +01:00
Laurent Rineau 92f464232a Allow to add CGAL_DISABLE_GMP lately in the cache 2013-03-15 16:39:59 +01:00