Commit Graph

383 Commits

Author SHA1 Message Date
Sébastien Loriot 47b7ac3c07 update script to find QGLviewer so that the environment variable is used first 2015-07-10 11:32:20 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Sébastien Loriot 89184387d6 remove no longer needed QT4 cmake scripts 2015-07-07 18:00:43 +02:00
Laurent Rineau 99f8b0d80e Allow to find QGLViewer-qt5 on Windows too 2015-07-06 17:29:39 +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
Maxime Gimeno 7f3d6e35c5 Merging and integration of Polyhedron_Demo
- The Splatting has been deactivated
- The Scene_item class has a new member of type QOpenGLFunctions, allowing to use all shader functions without need for GLEW
2015-04-27 14:51:48 +02:00
Maxime Gimeno ed3298ee2f Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
2015-04-27 08:50:06 +02:00
Maxime Gimeno 89348a1ab9 cut_plugin fixed
- replaced the missing modified files by the originals
- added a reference to a vector of floats in traits so that it fills it instead of drawing the bboxes
2015-04-24 15:59:23 +02:00
Laurent Rineau 4a7a614e5d Allow to find QGLViewer-qt5_
Conflicts:
	Installation/cmake/modules/FindQGLViewer.cmake
2015-04-03 12:35:37 +02:00
Laurent Rineau 4eef28be7e Minimal version of Boost: 1.48 2015-04-01 17:31:17 +02:00
Laurent Rineau 7d4da6aee2 Add new additional versions of Boost (up to 1.69) 2015-04-01 17:28:30 +02:00
Maxime Gimeno fa430e5fc0 WORK IN PROGRESS 2015-03-31 11:05:17 +02:00
Maxime Gimeno 8b3cca50a0 Modifying to Qt5 2015-03-31 10:22:21 +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 fd2026a044 Find TBB first with NO_DEFAULT_PATH
With default CMake paths, the TBB installed in /usr/{include/,lib64/} is
found, whatever there is in TBB environment variables. If the search
with NO_DEFAULT_PATH does not find TBB, then the search is made again
with default paths.
2015-01-15 14:39:31 +01:00
Laurent Rineau 8231a36e89 Add Boost_DEBUG as an advanced OPTION 2014-11-28 12:09:14 +01:00
Laurent Rineau da77e0d819 Name of leda_numbers of Windows
Trivial fix for master

(cherry picked from commit 601d05d717edead7ea8396a0f723b715bbd9bdc6)
2014-07-21 14:00:59 +02:00
Sébastien Loriot 25f74f2a74 LEDA library numbers has been renamed to leda_numbers
trivial bugfix for master
2014-07-18 16:04:27 +02:00
Clement Jamin fbf824c711 Merge branch 'Mesh_3-parallel-cjamin'
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3

Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +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 0f5fc963b4 Support QUIETLY in FindTBB.cmake 2014-07-09 15:36:25 +02:00
Sébastien Loriot 2aadba50d7 Merge branch 'BGL-redesign_final-GF'
Introduces a redesign of the CGAL extension of the BGL API

Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager

Conflicts:
	Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
2014-07-08 19:45:16 +02:00
Sébastien Loriot ec9c796552 remove exe flag 2014-07-04 17:24:06 +02:00
Laurent Rineau a25bc04512 On Fedora, users of TBB may need pthread 2014-07-03 18:45:36 +02:00
Laurent Rineau b9cd9d198c LEDA_INC_DIR is a PATH, not a FILEPATH 2014-07-02 14:16:21 +02:00
Laurent Rineau 7e4607f77b Minor modifications
- less verbose
- support libraries in a subdirectory lib/ of the LEDA directory.
2014-06-26 16:57:54 +02:00
Laurent Rineau 2eef30914a Support libnumber.so 2014-06-26 16:57:36 +02:00
Laurent Rineau 460bbdfc8b Hide those variables from the CMake GUI 2014-06-26 16:57:12 +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
Andreas Fabri 4c8f452a78 Add {Find/Use}Openmesh.cmake and fix the CMakeLists.txt 2014-06-11 12:13:50 +02:00
Laurent Rineau 22804c5aa2 Remove trailing whitespace 2014-02-12 09:49:57 +01:00
Laurent Rineau d537497b88 Fix a typo 2014-02-12 09:49:13 +01:00
Laurent Rineau 909691f77c Add support for VC12 (and VC13) 2014-02-11 16:18:39 +01:00
Laurent Rineau 151844059a Fix a typo (found by Mael) 2013-10-29 16:19:15 +01:00
Laurent Rineau 9211e0eb2a Sort of bug-fix: unhide an important CMake variable 2013-09-16 14:30:06 +02:00
Andreas Fabri 78a3de4955 Search for taucs.h and not for the directory auxiliary/taucs/include
This leads to false positives
(cherry picked from commit a5d9d001aa995c4a66d73a40cbc6a1a22b795d4d)

Message added by Laurent Rineau:

  that commit was tested in CGAL-4.3-Ic-168
2013-09-12 12:01:39 +02:00
Laurent Rineau 85eeaca873 Link with the CGAL *target* we possible (instead of linking with the library)
That is a late follow-up to the following commit:

  | commit 12744ab7ff
  | Author: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
  | Date:   Thu Apr 28 13:11:09 2011 +0000
  |
  |     Track dependencies between libraries and examples/demos
  |
  |     With this patch, when CGAL as been configured with WITH_examples and/or
  |     WITH_demos, then the executables of examples and demos depends on the CGAL
  |     libraries. That means if one change a file involved in a CGAL library, and
  |     ask the rebuild of an executable, then the CGAL library will be rebuilt
  |     first.
  |
  | Notes:
  |     r63187 branches/next

Or maybe the bug was re-introduced by recent modifications of our CMake
scripts.
2013-08-20 15:45:29 +02:00
Laurent Rineau e724c1f519 Fix end-of-lines and end-of-files 2013-07-04 11:51:23 +02:00
Clement Jamin 8b0edee1f4 Merge branch 'concurrency_in_cgal-cjamin-old' into concurrency_in_cgal-cjamin 2013-07-03 17:17:34 +02:00
Clement Jamin 4d0c6a6bb0 Better FindTBB.cmake which works even if the debug version is not found
If the debug versions are not found, the release versions will be used instead
for the debug mode.
If the tbb_malloc library is not found, doesn't link with it.
2013-07-03 16:48:10 +02:00
Clement Jamin 9c57c17a34 Bugfix for TBB_LIBRARY_DIRS 2013-07-03 12:28:50 +02:00
Clement Jamin 3dfb28141f Mark TBB_MALLOCPROXY_XXX_LIBRARY as advanced in CMake 2013-06-28 17:55:12 +02:00
Clement Jamin da77b4d879 Correct FindTBB.cmake + add a UseTBB.cmake 2013-06-27 16:50:55 +02:00
Clement Jamin 90d0125741 Improved FindTBB.cmake
- Untabified
- Does not link with the TBB mallow proxy anymore, but set
  TBB_MALLOCPROXY_DEBUG_LIBRARY and TBB_MALLOCPROXY_RELEASE_LIBRARY
  so that a user can still link with it if necessary
  Note: the malloc proxy is not available on MacOS.
- Calls include_directories ( ${TBB_INCLUDE_DIRS} ) and
  link_directories( ${TBB_LIBRARY_DIRS} ) to set paths
2013-06-27 15:54:39 +02:00
Laurent Rineau 723a257a73 Merge branch 'Installation-tweak_FindEigen-lrineau' 2013-04-26 15:40:54 +02:00
Laurent Rineau bf39cc5e7c Add new names for leda libraries in FindLEDA.cmake
Under Windows, the libraries can be named leda_md and leda_mdd (debug).
2013-04-25 11:01:45 +02:00
Laurent Rineau c6c0a606ce Remove the variable Boost_DIR from the CMake cache
The CMake module FindBoost.cmake searchs for Boost first in the "Config
mode" of 'find_package'. That allows to find installation of boost-cmake
(that is Boost configured using CMake). That configuration of Boost is
rather rare. But the search for it leaves a variable Boost_DIR=NOTFOUND in
the cache, even if Boost libraries are found using the regular way.

That patch removes from the cache the variable Boost_DIR, when Boost is
already found, to avoid more confusion for users.
2013-03-18 16:17:04 +01:00
Laurent Rineau 92f464232a Allow to add CGAL_DISABLE_GMP lately in the cache 2013-03-15 16:39:59 +01:00
Andreas Fabri 02bb200fe5 Add a CMake variable that allows to disable GMP/MPFR 2013-03-15 14:11:34 +01:00
Laurent Rineau c0039287df Fix the detection of BLAS/LAPACK/TAUCS with MSVC
The CMake script was only testing if the sub-directory auxiliary/taucs/
existed. That directory exists in Git for a while, because we ship a README
file in it. Now the CMake script checks for auxiliary/taucs/include/. That
is as naive as before but at least it will work.
2013-03-05 13:54:51 +01:00