3cf08a5949
Set Eigen3 use file name in CGAL common
...
ensure the use file is known even if the FindEigen3.cmake
shipped with Eigen is used
2016-06-06 14:07:23 +02:00
fc992ed0c3
Replace the string(REPLACE vc...) by a single string(REGEX REPLACE ...).
2016-06-01 09:59:27 +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
71d91f9b99
Merge pull request #835 from bo0ts/patch-1
...
Require correct Boost version through CMake
2016-03-24 11:31:38 +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
31d416df4e
Fixes the PR #788
...
With the split of `CGALConfig.cmake` into several files, one for each
lib, then the variable `CGAL_ImageIO_USE_ZLIB` was no longer stored in
`CGALConfig.cmake`.
That led to a full blue line in the testsuite:
https://cgal.geometryfactory.com/CGAL/Members/testsuite/results-4.8-Ic-155.shtml#Mesh_3_Examples
2016-03-10 11:56:55 +01:00
a3ba66c458
include export and lib config files on demand
2016-03-04 12:05:25 +01:00
e261b3ad4f
Require correct Boost version through CMake
...
This catches errors early and provides a clear error message instead of waiting for something in a test or example to break.
2016-02-26 17:52:36 +01:00
9e7423fba6
Add missing _LIBRARY to variable on MSVC
2016-02-18 15:01:37 +01:00
0a685e82b3
Remove CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT from Macros
...
This is the only place that uses the option. Because the code was
wrongly indented (several ifs missing a level) the removal looks
horrible.
2016-02-16 17:21:23 +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
732d6ccb96
Generate a config file for each lib
2016-02-16 17:02:56 +01:00
1aa334ff34
Remove unnecessary variable
...
Never used anywhere and does not work with out-of-source builds
anyway...
2016-02-16 17:02:56 +01:00
4211a4f01e
Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS
...
This is a Cmake 2.4.3 variable that isn't even documented anymore.
2016-02-16 17:02:55 +01:00
c3fba6c5ab
Remove unnecessary variable
...
Correct name would be CMAKE_COLOR_MAKEFILE and default is ON anyway.
2016-02-11 15:58:14 +01:00
2b49997c7e
Merge pull request #493 from afabri/CGLAL-thread_local_storage-GF
...
Remove boost thread dependency
2016-01-04 16:49:26 +01:00
c2003e8a2a
Add test for c++1z and gnu++XX flags
2015-12-17 10:18:20 +01:00
b5546cb802
Merge pull request #486 from lrineau/Installation-visual_leak_detector-lrineau
...
Enable the use of Visual Leak Detector in CGAL
2015-11-26 14:30:14 +01:00
e997e68582
missing c++98
2015-11-23 10:23:57 +01:00
260a501941
support more g++ version and enhance doc
2015-11-23 10:21:21 +01:00
d1489cd7e0
fix and simplify when boost libs are needed
2015-11-20 14:30:34 +01:00
86a2225a0c
boost thread not needed if using gcc 4.8 or greater in c++1[1/4] mode
2015-11-19 18:55:42 +01:00
6b2c4dd7c6
Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF
2015-11-09 14:26:42 +01:00
eb4f860f3b
remove mentions of Qt3
2015-10-05 15:19:58 +02:00
bd1de66629
Update CGAL_SetupBoost
2015-10-02 10:30:36 +02:00
d7c7747927
fix for non VC++
2015-10-02 10:23:27 +02:00
833bd5c49c
no Qt3 in the installation manual
2015-10-01 14:52:05 +02:00
47a41ccab0
cleanup
2015-10-01 12:38:55 +02:00
1a4faa8575
Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF
2015-10-01 10:03:04 +02:00
24666eb13e
deal with msvc12 and msvc14
...
until now, msvc14 is not supported by tbb (<= 4.4)
this commit prevents the testsuite from looking for it
2015-09-08 10:21:55 +02:00
bc5272495b
For MSVC we no longer require boost thread and system
2015-09-04 11:50:54 +02:00
714fc9092b
Remove an unused file
...
This file was unused for six years:
cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake
I remove it.
2015-08-03 15:00:18 +02:00
f3d55fcb63
Add support for VC14 (from MSVC 2015)
...
There was eventually no VC13.
- In cmake/modules/CGAL_GeneratorSpecificSettings.cmake replace it by
MSVC14. Add a support for a futur MSVC15.
- Synchronize include/CGAL/auto_link/auto_link.h from the future
Boost-1.59 (not yet released), to add support for VC14/MSVC2015.
2015-07-30 11:28:13 +02:00
e43b1e42ba
Do include the export file if CMP0024 does not exist
...
With CMake-2.8.11, CMP0024 does not yet exist, and the target aliasing
feature does not exist either. So the only solution is to include the
export file.
2015-07-14 16:06:53 +02:00
877634ba9f
Avoid multiple definitions of the target aliases
...
With -DWITH_demos:BOOL=TRUE, the CGALConfig.cmake is included multiple
times. This patch avoids that one tries to define multiple times the
same target aliases.
2015-07-14 15:59:56 +02:00
3262264cbd
Search dependencies quietly
2015-07-14 15:12:47 +02:00
fb4975f469
Check if the libraries are actually defined
...
In CGALConfig.cmake, the former code was just checking if
WITH_${CGAL_LIB} was TRUE. Now, the new code also checks if the target
was actually defined. If the target is not defined by WITH_${CGAL_LIB}
is ON, if probably means that one dependency of the library was not
properly configured.
2015-07-14 15:12:47 +02:00
34ccb7facd
Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
...
Add a CGALExports.cmake file
Conflicts:
Installation/cmake/modules/CGALConfig_binary.cmake.in
This merge should fix the warning caused by CMP0024.
2015-07-13 12:45:19 +02:00
ed71d08e3d
Do not include the CGALExport.cmake file while still building CGAL
...
This rightfully triggers CMP0024, since the file created by export might
not exist at configure-time. We need to do some extra work to avoid
reading the LOCATION property from a non-imported target hence we
trigger policy CMP0026.
2015-07-10 15:33:37 +02:00
518faece88
Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF
2015-07-10 14:04:03 +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
47b7ac3c07
update script to find QGLviewer so that the environment variable is used first
2015-07-10 11:32:20 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
89184387d6
remove no longer needed QT4 cmake scripts
2015-07-07 18:00:43 +02:00
99f8b0d80e
Allow to find QGLViewer-qt5 on Windows too
2015-07-06 17:29:39 +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
e7a6f80f05
Check for MSVC when defining library paths
...
We do not know the value of CGAL_AUTO_LINK_ENABLED yet because it is
defined by CGAL_GeneratorSpecificSettings.cmake but this is
equivalent. This is also not a problem, because CGAL_AUTO_LINK_ENABLED
is not user-editable and always enabled on MSVC.
2015-06-24 17:21:37 +02:00
8b6acec1b3
Use the LOCATION property to set _LIBRARY variables
...
Inspect the imported targets for information instead of using
configure_file.
2015-06-23 17:59:48 +02:00
9e807d8e2d
Include the export files through CGALConfig
2015-06-23 16:30:46 +02:00
Sébastien Loriot
Maxime Gimeno
Laurent Rineau
Philipp Moeller
Philipp Möller
Sebastien Loriot
Simon Giraudot
Andreas Fabri
Guillaume Damiand
Jane Tournois