Commit Graph

1558 Commits

Author SHA1 Message Date
Eric Berberich 1203d5631d typo CGALCore -> CGAL_Core 2012-10-04 08:57:24 +00:00
Philipp Möller 50e5409ffe Merge next and restore the temporary delete of Bounding_volumes/doc 2012-09-20 11:37:03 +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
Philipp Möller 864aebe2e5 Merge next.
This commit also updates the respective mock-headers when the
corresponding .tex documentation has changed. This has been the case for:

AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_features.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_no_features.tex
Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex
Number_types/doc_tex/NumberTypeSupport_ref/Lazy_exact_nt.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_2.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_3.tex
Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex
2012-09-12 14:14:22 +00:00
Sébastien Loriot 80d4e7e90e update changes 2012-09-03 12:56:01 +00:00
Laurent Rineau 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
Eric Berberich 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
Eric Berberich 80616feea6 added missing $ to copy content of variable 2012-08-20 08:10:20 +00:00
Eric Berberich 6a6dfc5fc2 added MPFI + NTL
Coin3D and IPE should be added by added developers
2012-08-20 07:48:01 +00:00
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 9d5be4292e Announce that 4.1 supports clang on macos 2012-08-10 14:01:53 +00:00
Laurent Rineau e17c0da875 Revert commits 70941 and 70940:
| ------------------------------------------------------------------------
  | r70941 | lrineau | 2012-08-01 16:50:50 +0200 (Wed, 01 Aug 2012) | 1 line
  | 
  | Rename my two Intel Compiler platforms
  | ------------------------------------------------------------------------
  | r70940 | lrineau | 2012-08-01 16:44:02 +0200 (Wed, 01 Aug 2012) | 1 line
  | 
  | Update the Intel Compiler to 12.1 (aka 2011_sp1)
  |  ------------------------------------------------------------------------
and change the Installation/changes.html: CGAL-4.1.0 will not support the
Intel Compiler 12.1, but only 12.0. That is too late.
2012-08-10 12:51:15 +00:00
Laurent Rineau 90414d195f Move <CGAL/Testsuite/use.h> to <CGAL/use.h> (in the Installation package)
That is a followup to the following commit:
  | ------------------------------------------------------------------------
  | r71090 | pmoeller | 2012-08-07 13:04:32 +0200 (Tue, 07 Aug 2012) | 6 lines
  | Changed paths:
  |    M /branches/next/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h
  |    M /branches/next/Circulator/include/CGAL/circulator.h
  |    M /branches/next/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h
  |    M /branches/next/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp
  |    M /branches/next/Kernel_d/include/CGAL/Cartesian_d.h
  |    M /branches/next/Mesh_3/include/CGAL/IO/File_medit.h
  |    M /branches/next/Mesh_3/include/CGAL/Mesh_cell_criteria_3.h
  |    M /branches/next/Mesh_3/include/CGAL/Mesh_edge_criteria_3.h
  |    M /branches/next/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h
  |    M /branches/next/Mesh_3/include/CGAL/make_mesh_3.h
  |    M /branches/next/Nef_2/include/CGAL/Bounded_kernel.h
  |    M /branches/next/Nef_2/include/CGAL/Nef_polyhedron_2.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_3/ID_support_handler.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_polyhedron_3.h
  |    M /branches/next/Nef_3/test/Nef_3/nef_union_error_llvm.cpp
  |    M /branches/next/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h
  |    M /branches/next/OpenNL/include/CGAL/OpenNL/blas.h
  |    M /branches/next/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
  |    M /branches/next/Point_set_processing_3/include/CGAL/mst_orient_normals.h
  |    M /branches/next/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h
  |    M /branches/next/STL_Extension/include/CGAL/iterator.h
  |    M /branches/next/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h
  |    M /branches/next/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h
  |    M /branches/next/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h
  |    M /branches/next/Surface_mesher/include/CGAL/Surface_mesh_default_criteria_3.h
  |    M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h
  |    M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h
  |    M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h
  | 
  | WARNFIX: Silence a good part of unused variable/parameter warnings.
  | 
  | Wextra results in a dreadful wall of yellow in the test-suite and is
  | scary when using CGAL. Reduce some of the noise by silencing the
  | obvious cases with CGAL_USE or comments.
  | 
  | ------------------------------------------------------------------------

The reason is that everything from CGAL/Testsuite/ is removed in public
releases (that was discussed at a CGAL developers meetings, long ago). That
means that r71090 introduced compilation errors undetectable by the tests
of internal releases. I hope that the minutes of that developers meeting
say that I was against the removal of headers between internal and public
releases!  -- Laurent Rineau
2012-08-09 15:34:08 +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 dc0c0d7d9f removed debug output 2012-08-03 20:59:22 +00:00
Eric Berberich f46d0ced7d name now has CGAL_ prefix 2012-08-03 20:55:49 +00:00
Eric Berberich f1ad5a99de correct library src dir 2012-08-03 17:52:30 +00:00
Eric Berberich 9ad3cf9e02 corect name of ImageIO 2012-08-03 17:51:38 +00:00
Eric Berberich 67d5ac25d4 correct name of ImageIO 2012-08-03 17:51:07 +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
Philipp Möller e65a8028ea Replace tex-style quotes with quotes that you would expect, as there
is no way to handle them in the converter.

Needs to be revert before this is being merged into next.
2012-08-02 12:55:15 +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 de57846797 CGAL-4.1 will not support Intel Compiler 12.0, but 12.1 (the latest
non-beta)
2012-08-01 15:36:53 +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
Efi Fogel c8a956f6a2 Added 2D Arrangements changes for 4.1 2012-07-31 07:19:28 +00:00
Laurent Rineau 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
Laurent Rineau 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
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
Laurent Rineau 6507b3fd24 Fix a typo (missing closing parenthesis) 2012-07-24 11:45:28 +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 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
Laurent Rineau 4953bbbc86 Remove buggy executable bits 2012-07-04 19:28:22 +00:00
Laurent Rineau 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
Laurent Rineau 8e725dc83a Intel Compiler 11 is no longer tested. 2012-07-03 11:06:19 +00:00
Eric Berberich bc6d9c1005 fixed typo: added missing '_' 2012-07-03 10:53:25 +00:00
Eric Berberich ef6fa7a32b Merge Script-improve_create_cmake-eric into next
Main changes are
- new installation manual
- distinction between essential and optional libraries
- preconfiguration of optional libraries possible
2012-07-02 15:56:15 +00:00