songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
80,098 Commits 3 Branches 156 Tags 962 MiB
Commit Graph

691 Commits

Author SHA1 Message Date
Laurent Rineau 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
Clement Jamin 1526a93a31 CGAL_AUTO_LINK_ENABLED is also used for Boost & co 
So we need it even in header-only mode.
CGAL auto-link is already disabled in auto_link.h so it's not a problem.
 2016-03-11 09:47:59 +01:00
Laurent Rineau 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
Laurent Rineau 3536c89d70 Fix CGALConfig.cmake header-only 2016-03-09 18:53:59 +01:00
Guillaume Damiand bcd3b6cde3 Remove unused variable 2016-03-09 17:31:24 +01:00
Laurent Rineau 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
Guillaume Damiand 24b156e3c6 Add cgal header only also in CGALConfig_install.cmake.in 2016-03-09 16:38:54 +01:00
Guillaume Damiand b9d209ee62 Search required third party library in find component macro. 2016-03-09 12:41:42 +01:00
Guillaume Damiand 94f2565c6a Replace the name of the variable to enable header only mode in CGAL_HEADERS_ONLY 2016-03-09 10:56:11 +01:00
Guillaume Damiand 0f0aa9f764 Remove the find_package qt5 do in CGAL_Macros.cmake which is now done in CGALConfig_binary.cmake.in 2016-03-09 10:50:53 +01:00
Guillaume Damiand dff63d83d3 Correct the problem of cmake qt5 macro not available in header only when configuring cgal_qt5. 
To solve this problem, we added in the macro check_cgal_component the find package of qt5 if we are configuring cgal_qt5.
 2016-03-09 10:44:15 +01:00
Guillaume Damiand 38ca4dd5e0 Bugfix in check_cgal_component for its first call. 2016-03-09 10:42:46 +01:00
Guillaume Damiand 561b1f2a38 Do not need cgal_include_moc_files macro 2016-03-09 10:37:58 +01:00
Guillaume Damiand 16a19eb33e Ok for demo for aabbtree 2016-03-09 10:37:57 +01:00
Guillaume Damiand 78cde742ce Work on demo with qt5; ok for AABBtree (but need to be improved) 2016-03-09 10:35:22 +01:00
Guillaume Damiand d56092753a Make enable_header_only option persistent 2016-03-09 10:35:21 +01:00
Clement Jamin c7d3a58688 Do not set CGAL_AUTO_LINK_ENABLED to TRUE in header only mode 2016-03-09 10:31:17 +01:00
Sébastien Loriot a3ba66c458 include export and lib config files on demand 2016-03-04 12:05:25 +01:00
Philipp Moeller 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
Philipp Möller 9e7423fba6 Add missing _LIBRARY to variable on MSVC 2016-02-18 15:01:37 +01:00
Philipp Möller 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
Philipp Möller 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
Philipp Möller 732d6ccb96 Generate a config file for each lib 2016-02-16 17:02:56 +01:00
Philipp Möller 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
Philipp Möller 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
Philipp Möller c3fba6c5ab Remove unnecessary variable 
Correct name would be CMAKE_COLOR_MAKEFILE and default is ON anyway.
 2016-02-11 15:58:14 +01:00
Sebastien Loriot 2b49997c7e Merge pull request #493 from afabri/CGLAL-thread_local_storage-GF 
Remove boost thread dependency
 2016-01-04 16:49:26 +01:00
Simon Giraudot c2003e8a2a Add test for c++1z and gnu++XX flags 2015-12-17 10:18:20 +01:00
Sebastien Loriot 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
Sébastien Loriot e997e68582 missing c++98 2015-11-23 10:23:57 +01:00
Sébastien Loriot 260a501941 support more g++ version and enhance doc 2015-11-23 10:21:21 +01:00
Sébastien Loriot d1489cd7e0 fix and simplify when boost libs are needed 2015-11-20 14:30:34 +01:00
Sébastien Loriot 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
Andreas Fabri 6b2c4dd7c6 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-11-09 14:26:42 +01:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Guillaume Damiand bd1de66629 Update CGAL_SetupBoost 2015-10-02 10:30:36 +02:00
Andreas Fabri d7c7747927 fix for non VC++ 2015-10-02 10:23:27 +02:00
Andreas Fabri 833bd5c49c no Qt3 in the installation manual 2015-10-01 14:52:05 +02:00
Andreas Fabri 47a41ccab0 cleanup 2015-10-01 12:38:55 +02:00
Andreas Fabri 1a4faa8575 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-10-01 10:03:04 +02:00
Jane Tournois 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
Andreas Fabri bc5272495b For MSVC we no longer require boost thread and system 2015-09-04 11:50:54 +02:00
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 3262264cbd Search dependencies quietly 2015-07-14 15:12:47 +02:00
Laurent Rineau 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
Laurent Rineau 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
Philipp Möller 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
Laurent Rineau 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
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
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
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 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
Philipp Möller 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
Philipp Möller 9e807d8e2d Include the export files through CGALConfig 2015-06-23 16:30:46 +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
Andreas Fabri 2860662f77 Merge branch 'Installation-visual_leak_detector-lrineauTMP' into Installation-visual_leak_detector-lrineau 2013-11-19 14:46: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 ea6e24200c Allow the use of Visual Leak Detector 
See the small feature [[Small features/Visual_Leak_Detector]] in CGAL
developers wiki:
  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Visual_Leak_Detector

See also:
  http://vld.codeplex.com/
 2013-09-11 12:25:01 +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
Laurent Rineau a2c9ee5c43 Enhance FindEigen3 
1/ Check the version using 'find_package_handle_standard_args' internal
checking of version, instead of a home-made check.

2/ No need to add EIGEN3_INCLUDE_DIR in the cache, as find_path does it.

3/ Call 'find_package_handle_standard_args' even if EIGEN3_INCLUDE_DIR is
already and valid in the cache.
 2013-02-28 12:44:30 +01:00
Clement Jamin 0a89951884 Updated FindTBB.cmake so that it uses the "optimized"/"debug" cmake keywords 2013-01-23 15:14:08 +01:00
Clement Jamin 0fcd19db7a Updated FindTBB so that it looks for the malloc proxy + better error messages 2013-01-22 14:50:01 +01:00
Clement Jamin 5f7d4bd88d Original FindTBB.cmake file 2013-01-22 14:42:13 +01:00
Laurent Rineau 291b3029bb Fix a bug in CGAL_SCM.cmake when the HEAD is not a branch 
If the current working directory is a checkout of a commit that is not a
branch, for example, a commit in the ancestors of a branch, then CGAL CMake
scripts gave that CMake error:

  == CMake setup ==
  fatal: ref HEAD is not a symbolic ref
  CMake Error at Installation/cmake/modules/CGAL_SCM.cmake:36 (string):
    string sub-command REGEX, mode REPLACE needs at least 6 arguments total to
    command.
  Call Stack (most recent call first):
    CMakeLists.txt:17 (include)

  == CMake setup (DONE) ==

This patch fixes the error. If HEAD is not a branch, then CGAL_GIT_BRANCH
is equal to "HEAD".
 2013-01-21 17:23:36 +01:00
Laurent Rineau 3b1ba8ba70 Merge remote-tracking branch 'origin/Installation-link_libraries_deprecated-eric' 2013-01-14 14:50:59 +01:00
Eric Berberich 03c6c56549 not necessarily a CGAL_-UseFile 2012-12-28 18:55:50 +01:00
Eric Berberich 6eafd776c7 readded link_libraries 2012-12-27 20:01:56 +01:00
Laurent Rineau aa3d26e96c Merge branch 'Installation-CreateSingleSourceCGALProgram_warning-lrineau' 2012-12-05 11:42:09 +01:00
Philipp Möller 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +01:00
Laurent Rineau e33d05f919 Add a AUTHOR_WARNING if the source file does not exist. 2012-11-30 10:34:29 +01:00
Philipp Möller 3d253a0edd Add CGAL_GIT_HASH and provide defaults for all variables 2012-11-15 13:20:37 +01:00
Eric Berberich ddd4ca95da fix if git dir is already given dir 2012-11-13 16:20:07 +01:00
Eric Berberich 03ac16f071 whitespace for git 2012-10-23 23:27:34 +00:00
Eric Berberich fe43dd0171 better handling if source of executable is not in a git repo 2012-10-22 23:38:25 +00:00
Eric Berberich fc6d74c399 raise a CMake AUTHOR_WARNING if current branch does not match branch used to install cgal 2012-10-22 23:10:57 +00:00
Eric Berberich 358b8bb92b search for git parent dir + commented some verbosity 2012-10-22 23:09:58 +00:00
Eric Berberich 25f3fb6e2e remove SVN, refactored SCM code to CGAL_SCM.cmake 
(plan is to reuse it UseCGAL.cmake)
 2012-10-22 22:39:36 +00:00
Eric Berberich 1d59758d89 add an additional check for requested component and raise the "NOTICE" if lib is not build 2012-10-10 14:21:50 +00:00
Eric Berberich 7503d0ce5b merge from next 2012-10-08 09:57:49 +00:00
Eric Berberich 4cae227f10 NTL_VERSION can also be just \d.\d (regex was \d.\d.\d) 2012-10-05 22:34:46 +00:00
Eric Berberich 2bbc6c94a9 added missing { 2012-10-05 22:14:02 +00:00
Alexander Kobel e062c5f9e5 fixed PATH_SUFFIXES inconsistencies: 
- proper indentation
- merge double occurences
- standardize location at the end block, before DOC

tested with GMP(XX), MPFR, MPFI, LEDA, RS(3), NTL and a (small) number of ways to specify library
locations via environment and CMake variables, on Debian 64bit
 2012-10-05 12:40:10 +00:00
Alexander Kobel 461a23478d move detection whether additional LEDA flags are necessary to FindLEDA stage 
only apply includes if UseLEDA is called
 2012-10-04 13:28:51 +00:00
Alexander Kobel d3d82afd4a automatically add -ffriend-injection, -fno-strict-aliasing, -lX11 as required for LEDA 2012-10-04 12:07:42 +00:00
Alexander Kobel c06f84d4db fixed fallback to RS_dirs for RS3 2012-10-04 12:06:46 +00:00
Eric Berberich c81470929e fixed variable 2012-10-04 09:56:48 +00:00
Alexander Kobel 160e937500 try $ENV{<PKG>_DIR}/[include,lib] as a fallback for $ENV{<PKG>_[INC,LIB]_DIR} 2012-10-04 09:34:54 +00:00
Alexander Kobel 04f07ef7bf replace spurious *_LIBRARY_DIR occurences by *_LIBRARIES_DIR 2012-10-04 09:05:32 +00:00
Alexander Kobel bb5f4dc8e1 added evaluation of LEDA_LINKER_FLAGS 2012-10-04 09:00:46 +00:00
Eric Berberich 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
Eric Berberich 80616feea6 added missing $ to copy content of variable 2012-08-20 08:10:20 +00:00
Laurent Rineau 640c7355ec Fix: was no longer working in out-of-source build! 2012-08-06 13:21:07 +00:00
Eric Berberich 357d6258f5 cmake's link_libraries is deprecated 
removed almost all occurenced (missing UseFiles). While
doing so, some CMakeLists.txt could also be simplified. In fact
many more CMakeLists.txt can be simplified, in one of two ways:
1) add external libs to CGAL_3RD_PARTY_LIBRARIES and
2) call cgal_create_single_source_program
 2012-08-03 22:32:39 +00:00
Eric Berberich 5f524b0802 subdirectories in src finally get correct name 2012-08-03 17:21:30 +00:00
Laurent Rineau b22a86c1c1 Fix the CGALConfig.cmake that is installed, on Windows 2012-08-03 15:38:26 +00:00
Eric Berberich 2f6dae6bbb now I got it: it's not just the first argument, it's the first file 
"first" is a little bit general name for a parameter, changed
to firstfile and added a comment about handling other files
 2012-08-03 12:57:04 +00:00
Eric Berberich 293a072b43 make signatures consistent 2012-08-03 12:46:58 +00:00
Eric Berberich 05c4d0a28f be consistent in variable name 2012-08-03 12:23:40 +00:00
Laurent Rineau 4c3e1c3138 Fix mixed eol styles 2012-08-02 13:35:03 +00:00
Laurent Rineau 6e579584b3 Fix FindRS(3) modules 
A FindFoobar module must not include a UseFoobar file. CGAL_UseRS3 now
includes CGAL_UseMPFI, and not FindRS and FindRS3.

+ Fix also a typo in a message of FindRS3.
 2012-08-02 10:32:04 +00:00
Laurent Rineau 414182edbf Change the order of messages, to be coherent with CGAL_UseRS(3) 2012-08-02 10:02:34 +00:00
Laurent Rineau cf1ad35e79 Better formatting of the documentation of GMP CMake modules 2012-08-02 09:50:24 +00:00
Laurent Rineau 514c1efad1 Make RS, MPFI, LEDA, and NTL optional essential libraries 2012-08-01 16:58:19 +00:00
Laurent Rineau 98992ea06b Use include_directories(SYSTEM ...) in the macro use_lib 2012-08-01 12:23:53 +00:00
Laurent Rineau 8e167590c8 Use include_directories(SYSTEM ...) for 3rd-party libraries 
gcc has an option -isystem, that can replace -I. The documentation is:

 -isystem dir

     Search dir for header files, after all directories specified by -I but
     before the standard system directories. Mark it as a system directory,
     so that it gets the same special treatment as is applied to the
     standard system directories. If dir begins with "=", then the "=" will
     be replaced by the sysroot prefix; see --sysroot and -isysroot.


The "special treatment" means that gcc will not warn about constructions in
headers in directories pointed by -isystem instead of -I.

In the CGAL testsuite, there are a lot of warnings that comes from
third-party libraries (mostly from Boost, but also from Eigen).

This patch tells cmake to use -isystem with gcc, for all CGAL 3rd-party
directories.
 2012-08-01 10:53:37 +00:00
Laurent Rineau 767899fa33 Revert some modifications made by error. 2012-07-31 16:41:10 +00:00
Laurent Rineau 20762313af Refresh the FindQt3-patched module, from CGAL, with recent changes 
to the FindQt3 module shipped with CMake

CGAL FindQt3-patched module uses the prefix QT3_ for all cache variables,
instead of just QT_. That allows to use Qt3 and Qt4 in the same project
(but for different binaries of course).
 2012-07-26 09:28:21 +00:00
Ophir Setter 628087b87a moc-qt3 to come before moc. Now, if moc is qt4 moc the cmake file will use the correct moc in Qt3 2012-07-26 07:08:26 +00:00
Philipp Möller f330095286 Add Boost.System to the CGAL dependencies 
As of Boost 1.50 it is required to link Boost.System with CGAL. System
has been a Thread dependency all along and we simply never linked to
it and apparently got lucky.

Add it to the dependencies, add it in the manual and INSTALL file.
 2012-07-24 10:02:57 +00:00
Eric Berberich 972f164184 correct handling of optional parameter for use_lib macro 2012-07-05 18:33:27 +00:00
Eric Berberich 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
Eric Berberich 1d21969b14 revert use of macro and rely on list(FIND ...) 2012-06-29 22:53:42 +00:00
Eric Berberich 167783acde copy'n'paste works if the right includes exist: here missing CGAL_Macros 
instead of including the file I've just added the general cmake makro to 
check whether an item is in the list. Why does it need a macro? There should 
be a list-operation for that ...
 2012-06-29 22:22:25 +00:00
Eric Berberich 3a7ad3baaa mandatory -> essential 2012-06-29 15:27:45 +00:00
Eric Berberich 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
Eric Berberich d0d6335a79 added Eigen3_FIND_VERSION to search for minimal version 
CGAL_Common.cmake is included at a very early stage 
- when configuring CGAL but also
- when configuring demos etc
 2012-06-29 12:51:02 +00:00
Eric Berberich 87ebf20f51 need a certain order 2012-06-29 09:39:40 +00:00
Eric Berberich b5a4e941fd the mandatory libs need an particular order, and we simplify with a macro 2012-06-29 09:24:19 +00:00
Laurent Rineau 160975eb12 Leftover of previous commit: 
Second fix for Windows

On Windows, with auto-linking, the variables ${CGAL_LIB}_LIBRARY are
empty.

What is more, that is a bad idea to check if the libraries does exist. If
for example CGAL has been configured with WITH_CGAL_Qt4, and the CGAL_Qt4
library is not correctly created, we want a compilation error, and not just
a CMake warning saying "Please configure CGAL using WITH_${CGAL_LIB}=ON."
 2012-06-28 15:57:29 +00:00
Laurent Rineau 483593826b Second fix for Windows 
On Windows, with auto-linking, the variables ${CGAL_LIB}_LIBRARY are
empty.

What is more, that is a bad idea to check if the libraries does exist. If
for example CGAL has been configured with WITH_CGAL_Qt4, and the CGAL_Qt4
library is not correctly created, we want a compilation error, and not just
a CMake warning saying "Please configure CGAL using WITH_${CGAL_LIB}=ON."
 2012-06-28 15:47:16 +00:00
Eric Berberich eb6c435c4a correct spelling of GMPXX_FOUND variable 
FOUND_GMPXX -> GMPXX_FOUND
 2012-06-28 13:02:32 +00:00
Eric Berberich 3336c68671 fix for optional parameter 2012-06-28 12:47:13 +00:00
Eric Berberich df72a1aa08 macro use_lib now has an optional second parameter for UseFile 
this avoids a nasty hack with checking for a leading ### in a string and 
allows to use "use_lib( FOO )" in other places much easier
 2012-06-28 12:20:52 +00:00
Eric Berberich ee0fde5d13 re-added files probably used by external users 2012-06-28 12:03:12 +00:00
Laurent Rineau bccf95ba88 Add a comment for later in CGAL_Macros.cmake 2012-06-27 16:33:35 +00:00
Eric Berberich d4a6f27503 replace calls to UseESTBL 2012-06-26 23:52:07 +00:00
Eric Berberich 3ae59a513c removed verbosity 2012-06-21 22:07:04 +00:00
Eric Berberich 00330ee225 GMP and MPFR are mandatory 2012-06-21 21:57:42 +00:00
Eric Berberich 6b78ca27d6 use lib instead of vlib to be consitent with WITH_Lib 2012-06-21 14:54:46 +00:00
Sébastien Loriot d67be721d4 write prefix exception into config file and use default one otherwise for find_package 2012-06-21 14:27:35 +00:00
Sébastien Loriot 3efc565b71 bug in prefix setting 2012-06-21 12:42:08 +00:00
Sébastien Loriot b5ac8afe11 add comment 2012-06-21 12:04:22 +00:00
Sébastien Loriot c2240ede0e fix for ignoring preconfig 2012-06-21 09:53:03 +00:00
Sébastien Loriot 5dd3045330 move installation dir setup in demo script 2012-06-21 09:51:55 +00:00
Eric Berberich 4bdf466f9d Request by Sebastien Loriot: Ignore a preconfig lib 2012-06-21 07:58:51 +00:00
Sébastien Loriot e7e15113ef modification for IPE 
->move the version check and the installation directory detection into the 
  demo CMakeLists.txt
 2012-06-20 15:12:28 +00:00
Eric Berberich 3fde316a6c added CGAL_ENABLE_PRECONFIG (the default value has to be determined) 2012-06-20 11:16:17 +00:00
Sébastien Loriot 7b5902c9f6 default IPE_VERSION to AUTODETECT 2012-06-19 09:36:04 +00:00
Eric Berberich 94f7f0c3ab remove some verbosity 2012-06-11 22:06:08 +00:00
Eric Berberich 3599206bf2 improved verbosity 2012-06-11 21:44:17 +00:00
Eric Berberich 4009ef00ae nicer output 2012-06-11 21:30:45 +00:00
Eric Berberich 1c1d5a0f69 better name 2012-06-11 21:11:26 +00:00
Eric Berberich 10d8114ed3 fix for Eigen 2012-05-28 08:05:24 +00:00
Sébastien Loriot 41d3549414 typo LIRARIES->LIBRARIES 2012-05-25 11:10:54 +00:00
Eric Berberich 2231271896 CGAL macro is not used anymore 2012-05-24 07:10:42 +00:00
Eric Berberich 60efbec2d3 merge from next 2012-05-20 11:50:30 +00:00
Eric Berberich 9a0e579445 use hints 2012-02-13 14:26:33 +00:00
Eric Berberich 590111df6d typo for lib 2012-01-31 14:32:43 +00:00
Eric Berberich 8fc6cec7b6 added missing lib 2012-01-31 13:22:02 +00:00
Eric Berberich dc2fb9242a make GMP+MPFR mandatory 2012-01-31 10:47:45 +00:00
Laurent Rineau 7b2e34d267 merge with next 2012-01-27 16:46:42 +00:00
Laurent Rineau 24ec9f43fb merge changes from next 2012-01-25 11:23:02 +00:00
Laurent Rineau 7177fa5a63 Add a check that NDEBUG is not defined by test platforms 2012-01-25 11:14:17 +00:00
Sébastien Loriot d44761fce6 merge from next 2012-01-24 17:27:56 +00:00
Eric Berberich abd8cf62a6 fixed spacing 2012-01-24 12:25:12 +00:00
Eric Berberich 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Eric Berberich ee6c8d4775 need GMP version 2012-01-21 16:41:47 +00:00
Eric Berberich cb485d4008 write info to cache only it WITH_<library> = ON 2012-01-21 16:41:37 +00:00
Eric Berberich f2eef3c11b need gmp version 2012-01-21 16:41:12 +00:00
Laurent Rineau baeec2d53f merge all the changes from next! 2012-01-20 17:45:27 +00:00
Sébastien Loriot d5bf9ee997 merge from next 2012-01-20 10:30:58 +00:00
Eric Berberich 76cfe2ae9b let NTL work without preconfig 2012-01-19 15:25:53 +00:00
Laurent Rineau 2dd281500a Followup to that commit: 
| ------------------------------------------------------------------------
  | r65982 | lrineau | 2011-10-20 17:49:05 +0200 (Thu, 20 Oct 2011) | 8 lines
  | Changed paths:
  |    M /branches/next/Scripts/scripts/cgal_create_cmake_script
  | 
  | Improvement of cgal_create_cmake_script
  | 
  | This allows to create a CMakeLists.txt in a directory whereas the sources
  | are in another directory.
  | 
  | This will allow out-of-sources creation of CMakeLists.txt files. And, in
  | the end, that will improve the branch-build.
  | 
  | ------------------------------------------------------------------------

Make create_single_source_cgal_program() compatible with absolute paths
 2012-01-18 13:58:12 +00:00
Sébastien Loriot 3e4ea6c3b1 merge from next 2012-01-13 13:19:58 +00:00
Eric Berberich 406810fe52 need to set flag in compiler_config.h 2012-01-11 16:11:02 +00:00
Eric Berberich dfd8e8ed64 distinguish internal libs and external libs as COMPONENTS 2012-01-11 01:32:56 +00:00
Eric Berberich 303afc2973 check WITH_LIB in case CGAL is build, but not if CGAL is only used 2012-01-11 01:30:10 +00:00
Eric Berberich 0abb3588b7 added some guards for forbidden/stupid lib configurations 2012-01-11 00:05:00 +00:00
Eric Berberich 809b15bef1 cleanup 2012-01-10 18:28:39 +00:00
Eric Berberich 3c291f7103 removed output 2012-01-10 18:12:37 +00:00
Eric Berberich d83bb49f22 cosmetics 2012-01-10 14:36:33 +00:00
Eric Berberich 3135d995dd remark for a thrown warning 2012-01-10 12:30:53 +00:00
Eric Berberich 0def3cb179 improved formatting 2012-01-10 10:17:43 +00:00
Eric Berberich 7945fb8ea5 improved formatting 2012-01-10 10:17:09 +00:00
Eric Berberich 66bc1cef1e merge from next 2012-01-09 12:42:00 +00:00
Sébastien Loriot 6e1df30eff merge from next 2011-12-26 13:15:30 +00:00
Sébastien Loriot 9b75cd5506 require Eigen 3.1 or greater 2011-12-22 16:06:37 +00:00
Laurent Rineau 06c96d91ce Do not include CGAL include dirs *before* user ones!! 2011-12-07 10:49:43 +00:00
Sébastien Loriot bdcf26bb20 merge next 2011-12-01 09:19:02 +00:00
Laurent Rineau 93d8367048 merge from next 
This branch still has to be tested.
 2011-10-26 14:40:48 +00:00
Laurent Rineau b978f9bb85 merge from next 2011-10-26 13:02:45 +00:00
Laurent Rineau 5a7b6ace88 Bug fix: if CGAL_Boost_USE_STATIC_LIBS evaluates to FALSE, one wants to use 
its value anyway.
 2011-10-26 11:24:17 +00:00
Laurent Rineau ec5b246a55 Improve the display of full compiler version: support MSVC 2011-10-26 09:41:51 +00:00
Laurent Rineau fcc0874c59 Do NOT include CGAL_INCLUDE_DIRS before! 
We want, for example, to have CMAKE_BINARY_DIR/include before those dirs.
 2011-10-21 14:44:53 +00:00
Laurent Rineau badcdb5871 Completely remove the support for auto-linking of GMP and MPFR 
I have grepped for auto_link/(GMP|MFR)|AUTO_?LINK_(GMP|MPFR) and I removed
completely any support for auto-linking of GMP and MPFR from CGAL.

That is no longer necessary, nor relevant, no that we provide precompiled
GMP and MPFR libraries under standard names libgmp-10.lib and
libmpfr-4.lib.

To test in candidates: 
   Core
   Installation
   Number_types
 2011-10-14 13:39:45 +00:00
Laurent Rineau 5da9888303 Typo in text: s/option/variable/ 2011-10-13 15:38:13 +00:00
Laurent Rineau e3eef962d7 Do not add -DBOOST_DYN_LINK with auto-link if not enabled. 
In particular, do not add that macro definition on Linux/MacOS.
 2011-10-13 15:34:44 +00:00
Laurent Rineau 2e05123891 merge from next 2011-10-13 10:19:46 +00:00
Laurent Rineau c1fff72997 Revert that commit, which was wrong (see below): 
| ------------------------------------------------------------------------
  | r65557 | lrineau | 2011-09-26 16:49:02 +0200 (Mon, 26 Sep 2011) | 9 lines
  | Changed paths:
  |    M /branches/next/Installation/cmake/modules/CGAL_UseBLAS.cmake
  |    M /branches/next/Installation/cmake/modules/CGAL_UseLAPACK.cmake
  |    M /branches/next/Installation/cmake/modules/FindBLAS.cmake
  |    M /branches/next/Installation/cmake/modules/FindLAPACK.cmake
  |    M /branches/next/Installation/doc_tex/Installation/installation.tex
  | 
  | BLAS and LAPACK do not have header files.
  | 
  | One implementation of BLAS or LAPACK can have a header file, but that is
  | not mandatory for an implementation, and (hopefully) nothing in CGAL tries
  | to include a blas.h or a lapack.h.
  | 
  | The current revision removes mentions of BLAS_INCLUDE_DIR and
  | LAPACK_INCLUDE_DIR in CGAL cmake scripts about BLAS and LAPACK.
  | 
  |
  ------------------------------------------------------------------------

Reason:

  For the implementation cblas/clapack, our use of that implementation does
  need a header <blaswrap.h> to work.
 2011-10-13 10:17:16 +00:00
Laurent Rineau d57c543d60 Bug fix again. Use cache_set with two arguments. 2011-10-12 15:03:08 +00:00
Laurent Rineau 7225ec7d1c Fix bug in a previous commit 
A variable must be in cache before is can be use with add_to_cached_list.
 2011-10-12 14:39:57 +00:00
Laurent Rineau 5946c69608 merge from next 2011-10-12 13:52:06 +00:00
Laurent Rineau 6985effcc8 Fix the CMake module CGAL_SetupBoost shipped with CGAL 
CGAL_Boost_USE_STATIC_LIBS is now an (advanced) CMake option on all
platforms, and is stored in the generated CGALConfig.cmake. That way, its
value is proposed as the default value for the same option when programs
using CGAL are configured using CMake.

The script UseCGAL includes the module CGAL_TweakFindBoost, to define
Boost_USE_STATIC_LIBS and Boost_ADDITIONAL_VERSIONS.
 2011-10-12 13:47:18 +00:00
Laurent Rineau 7059bf007a fix typo in text 2011-10-11 16:08:24 +00:00
Laurent Rineau 2ceafafab9 Cleanup in the CMake variable CGAL*SHARED_LIB* 
Previously there was a variable CGAL_SHARED_LIBS defined by
CGALConfig.cmake. This one is now unified with CGAL_BUILD_SHARED_LIBS.

And the option CGAL_BUILD_SHARED_LIBS is only defined as an option if one
are building CGAL libraries. If CGAL_Common.cmake is included from another
project, such as from UseCGAL.cmake, then this variable is set in
CGALConfig.cmake as a regular (non-cached) CMake variable.
 2011-10-11 14:24:22 +00:00
Laurent Rineau 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
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Laurent Rineau aa00f78883 Also support the compilation of CGAL libraries as static libs, with MSVC. 2011-10-06 16:01:16 +00:00
Laurent Rineau 8056b1ed39 In CMake, Windows users will have the choice to choose to use static or 
dynamic Boost libraries
 2011-10-06 13:15:11 +00:00
Andreas Fabri cbfe32ce37 Add declspecs for Visual C++ so that we can build dlls 2011-10-05 19:12:23 +00:00
Sébastien Loriot 76b4363cd3 correctly parse IPE_VERSONLIB to detect minor versions of ipe 2011-09-29 07:57:17 +00:00
Laurent Rineau 9a21d66104 BLAS and LAPACK do not have header files. 
One implementation of BLAS or LAPACK can have a header file, but that is
not mandatory for an implementation, and (hopefully) nothing in CGAL tries
to include a blas.h or a lapack.h.

The current revision removes mentions of BLAS_INCLUDE_DIR and
LAPACK_INCLUDE_DIR in CGAL cmake scripts about BLAS and LAPACK.
 2011-09-26 14:49:02 +00:00
Laurent Rineau dbf3ace24b merge from next 2011-09-22 07:56:49 +00:00
Sébastien Loriot 62ed832e2b *Add a model for SVDTraits using Eigen and use it by default. Update the doc. 
*Add non-sparse matrix class (thus renamimg of the existing one)
*specialisation of the matrix class in Eigen_solver_traits according
 whether this is a symmetric or asymmetric matrix
*update use-files of lapack and Taucs to get definitions
 2011-09-21 12:36:13 +00:00
Sébastien Loriot a33f35551a *modify FindEigen3 to specify a use-file and to cache the include directory 
*add a eigen3 use-file
 2011-09-20 14:17:05 +00:00
Sébastien Loriot 350e386a8f add a copy of the cmake module FindEigen3 taken from eigen repo 2011-09-20 14:00:38 +00:00
Laurent Rineau 8779d9c684 Add comments of unused macros, for later cleanup 2011-07-21 14:28:57 +00:00
Laurent Rineau 369498d1e5 Cancel revision 64607. There had been a problem with the branch. 
| ------------------------------------------------------------------------
  | r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
  | 
  | Merged feature-branch Aos_2-new_functors-tau into next
  | ------------------------------------------------------------------------
 2011-07-06 11:11:58 +00:00
Laurent Rineau 768159d119 Remove a CMake warning about RUNNING_CGAL_AUTO_TEST that is not always 
used.
 2011-05-31 09:38:31 +00:00
Laurent Rineau 6c0a2019ba MS: auto-link for psapi.lib, instead of having an explicit link command. 2011-05-30 11:28:15 +00:00
Laurent Rineau 3b92a39100 Fix a bug in the branch build: put CGAL_INSTALLATION_PACKAGE_DIR in CGALConfig.cmake 
If CGAL_INSTALLATION_PACKAGE_DIR is not set in CGALConfig.cmake, then when
one compile a demo/example on Windows, Installation/auxiliary (where
precompiled version of some third party libraries should be put) cannot be
found and used. That replaces the old CMake variable CGAL_SOURCE_DIRECTORY
(before branch-build).
 2011-05-24 14:06:13 +00:00
Eric Berberich a54f16d874 fixed include order 2011-04-29 12:36:03 +00:00
Eric Berberich bcdc7c3771 merge from next 2011-04-28 21:35:58 +00:00
Laurent Rineau 12744ab7ff 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.
 2011-04-28 13:11:09 +00:00
Eric Berberich 026e830dec merge from next 2011-04-28 10:51:25 +00:00
Laurent Rineau 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
Eric Berberich 56c034b893 merge from next 2011-04-27 22:34:14 +00:00
Laurent Rineau d827ed8d74 Add quotes in execute_process if the command name is a variable. 2011-04-27 21:16:42 +00:00
Eric Berberich 74ff1eac2b removed unneccesary line 2011-04-26 09:54:51 +00:00
Eric Berberich 2bced23597 moved ${CGAL_LIB}_FOUND to config file 2011-04-24 08:15:42 +00:00
Eric Berberich 3dd1dec7a7 GMPXX only if not WIN32 2011-04-22 20:33:49 +00:00
Eric Berberich abec32922e added fix 2011-04-22 15:23:33 +00:00
Eric Berberich 4aa275ef5e cleanup 2011-04-22 13:56:45 +00:00
Eric Berberich 99916e2ca0 removed RS3 as added bby general loop 2011-04-22 13:49:38 +00:00
Eric Berberich 5f6ebda0cf split RS3 from RS 2011-04-21 21:21:36 +00:00
Eric Berberich 15b31230a7 added option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT 2011-04-21 14:25:13 +00:00
Eric Berberich 754a8fd50b fixed error 2011-04-21 14:21:11 +00:00
Eric Berberich 23af9bda01 added missing setup 2011-04-20 15:30:50 +00:00
Eric Berberich 72e82d7e9a fixed usages for Prefix 2011-04-20 15:24:59 +00:00
Eric Berberich e6b0ada67c use correct prefix, handling of mandatory libs improved 2011-04-20 14:23:30 +00:00
Eric Berberich 2489f2d396 deal with library variable prefixes 2011-04-20 14:09:01 +00:00
Eric Berberich 0b89dff151 removed code for special lib 2011-04-20 12:38:34 +00:00
Eric Berberich d6e292df02 fixed wrong spelling 2011-04-20 10:28:27 +00:00
Eric Berberich fba0d339e7 cleanup 2011-04-20 10:17:01 +00:00
Eric Berberich 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
Eric Berberich 1113802cc6 cleanup 2011-04-18 17:53:37 +00:00
Eric Berberich 367a387931 fixed tod 2011-04-18 08:54:00 +00:00
Eric Berberich 28cd8fc2a6 added list of supporting 3rd party libs 2011-04-18 08:46:51 +00:00
Eric Berberich 863f0c4de5 enable preconfiguration for external libs (for now only NTL, RS, MPFI), others to come 2011-04-17 19:55:06 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Eric Berberich 4b4d40e07e fixed include order to detect right library 2011-04-09 14:19:27 +00:00
Luis Peñaranda a5582e7d96 updated RS-use script, to allow old versions of RS to be used 2011-04-07 15:52:39 +00:00
Luis Peñaranda eb1f90d89c print RS version while configuring 2011-04-04 10:45:49 +00:00
Luis Peñaranda 9725595f60 updated my mail address 2011-03-22 08:07:15 +00:00
Laurent Rineau a5d71efc67 Do not set the CMake policy CMP0017 in the testsuite, so that one can see 
the warnings.
 2011-03-10 23:42:53 +00:00
Laurent Rineau 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
Laurent Rineau abfc4df4b3 If the compiler is llvm-clang, try to know what gcc version is used. 2011-03-08 14:05:19 +00:00
Laurent Rineau 371035235f Remove a DEBUG message. 2011-02-04 09:44:07 +00:00
Laurent Rineau 874ccfcad1 Fix FindMKL.cmake: 
- Intel the Runtime Library (RTL) can be in a different directory from the
  MKL library. That is why a new variable INTEL_RTL_LIB_DIR can be used to
  indicate its path.
- On Linux with g++, -lm must be used at link time to use MKL (otherwise it
  is not found).
 2010-11-17 16:53:22 +00:00
Laurent Rineau 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 6ec44afb49 Fix end of lines. 2010-09-24 17:39:12 +00:00