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

671 Commits

Author SHA1 Message Date
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
Andreas Fabri af87732f6a Add \anchor of chapters 2012-08-21 10:18:58 +00:00
Philipp Möller d3a9a641de Refurb package descriptions with a label for the license. 2012-08-20 14:28:36 +00:00
Philipp Möller 6a45864c1a Throw a set of ported doc files under version control 2012-08-09 16:07:44 +00:00
Eric Berberich 5f524b0802 subdirectories in src finally get correct name 2012-08-03 17:21:30 +00:00
Alex Tsui f27e1c2c7f Circular_arc_traits example compiles and runs, but just barely. 
* Currently errors out on attempting to insert intersecting arcs.
 2012-08-02 21:00:08 +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 a7a89c25b7 add_dependencies( Polygon_2 ${CGAL_LIBRARY} ) is useless 
Ar the target Polygon_2 links with the CGAL library, CMake already creates
a dependency.
 2012-07-31 16:18:17 +00:00
Alex Tsui 09857e2e74 Used sfinae to use circular and non-circular kernels with Converter. 2012-07-30 21:03:25 +00:00
Ophir Setter 005904363f Taking the multiplicity from base class. This caused all 64-bit programs to crash 2012-07-06 07:13:42 +00:00
Laurent Rineau 4953bbbc86 Remove buggy executable bits 2012-07-04 19:28:22 +00:00
Eric Berberich bc6d9c1005 fixed typo: added missing '_' 2012-07-03 10:53:25 +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
Laurent Rineau 947dd14f31 Minor fix: ensure the OpenGL version is displayed by test results pages 2012-06-29 10:57:59 +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 70e00b3d6e First fix for Windows: the auto-linking needs link_directories commands 2012-06-28 15:32:04 +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 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 67291a2c6d merge from next 2012-06-24 12:17:32 +00:00
Philipp Möller ea6635c86d Include the header with the declaration so that the declaration with 
the attribute precedes the definition.
 2012-06-20 10:20:27 +00:00
Alex Tsui 7ba8b08c4d Implemented insertion and removal of segments to arrangements. 2012-06-15 05:28:38 +00:00
Eric Berberich b6e350ccfa removed old verbose output 2012-06-11 22:24:22 +00:00
Eric Berberich 463a030267 removed old verbose output 2012-06-11 22:23:28 +00:00
Laurent Rineau 7b2e34d267 merge with next 2012-01-27 16:46:42 +00:00
Laurent Rineau 2fbd163e14 Factorize the installation command of CGAL library into the macro 
The macro build_cgal_library(..) now defines the installation rules. That
should also fix a bug: now .dll files will be installed in
${CGAL_INSTALL_BIN_DIR}.
 2012-01-25 16:49:39 +00:00
Laurent Rineau 8b413cef28 Remove variables CGAL_<lib>_BASENAME: no longer used. 2012-01-25 16:37:06 +00:00
Eric Berberich 8b63cf18fd fixed spacing 2012-01-24 13:13:27 +00:00
Eric Berberich 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Andreas Fabri 792deb3819 Fix for Windows 'min/max' bug and remove superfluous #include 2012-01-19 08:43:49 +00:00
Andreas Fabri 0d56ed88dc Fix for Windows 'min/max' bug 2012-01-19 08:11:02 +00:00
Andreas Fabri 560246e34b Fix for Windows 'min/max' bug 2012-01-19 08:07:40 +00:00
Andreas Fabri 0a89e16d86 Fix for Windows 'min/max' bug 2012-01-19 08:00:17 +00:00
Andreas Fabri 77f3648287 Fix for Windows 'min/max' bug 2012-01-18 12:02:15 +00:00
Andreas Fabri 26ec45fee9 Fix for Windows 'min/max' bug 2012-01-18 11:27:10 +00:00
Andreas Fabri 844e7869fa Fix for Windows 'min/max' bug 2012-01-18 11:25:40 +00:00
Andreas Fabri 10d334d4a5 Fix for Windows 'min/max' bug 2012-01-18 11:21:11 +00:00
Andreas Fabri 73a21e0f47 Fix for Windows 'min/max' bug 2012-01-18 11:17:08 +00:00
Andreas Fabri ae3244e596 Fix for Windows 'min/max' bug 2012-01-18 11:15:52 +00:00
Andreas Fabri f880735fbf Fix for Windows 'min/max' bug 2012-01-18 11:14:44 +00:00
Sébastien Loriot f6784b96e7 merge from next 2012-01-17 13:47:33 +00:00
Laurent Rineau 29d617e712 Cosmetic change: add a space after the license, to be compatible 
with the output of licensecheck
 2012-01-16 15:56:10 +00:00
Laurent Rineau a37c74d534 Add license files, per package 2012-01-16 15:54:22 +00:00
Sébastien Loriot a7456a2736 merge from next 2012-01-16 15:28:51 +00:00
Sébastien Loriot fca9a7bf54 *add operator>> for Constrained_triangulation_2 
*update demo
*add save CDT for demo

see the related small feature:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_read_istream_for_constrained_triangulation.
 2012-01-16 13:32:05 +00:00
Laurent Rineau 79f41a6c2f Add a license header 2012-01-16 10:54:58 +00:00
Laurent Rineau 2af2160942 Turn \ccLicenseQPL into \ccLicenseGPL 2012-01-13 17:13:55 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Eric Berberich a42d72acaa CGAL_USE_GMPXX is only set by use_lib macro 2012-01-11 00:00:05 +00:00
Eric Berberich 00d31036ea build_cgal_library -> collect_cgal_library (new macro name) 2012-01-10 18:17:53 +00:00
Eric Berberich 10af9912d9 CGALcomponent libs are not own CMake projects anymore 2012-01-10 18:13:19 +00:00
Eric Berberich 9cd61d509c let QT compile 2012-01-10 12:31:59 +00:00
Eric Berberich 66bc1cef1e merge from next 2012-01-09 12:42:00 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Sébastien Loriot 8ae6131f2e opti 2011-12-30 15:11:21 +00:00
Sébastien Loriot c564dfe82a fix drawing of degenerate parabola segment (source, target and center are collinear) 2011-12-30 15:00:46 +00:00
Laurent Rineau 98eccea610 Patch so that Qt's MOC can parse our headers, with Boost-1.48 
UPDATE: fix the previous commit. I applied the patch stupidly.

  | The patch is adapted from this bug report:
  | 
  | From: Mark Brand < mabrand@mabrand.nl>
  | To: cgal-discuss@lists-sop.inria.fr
  | Subject: [cgal-discuss] [PATCH] prevent Qt's moc from choking on BOOST_JOIN
  | 
  | See https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
 2011-11-21 17:06:17 +00:00
Laurent Rineau f5ec3f260c Patch so that Qt's MOC can parse our headers, with Boost-1.48 
The patch is adapted from this bug report:

From: Mark Brand < mabrand@mabrand.nl>
To: cgal-discuss@lists-sop.inria.fr
Subject: [cgal-discuss] [PATCH] prevent Qt's moc from choking on BOOST_JOIN

See https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
 2011-11-21 16:42:18 +00:00
Laurent Rineau 93486787c3 The inside of ccPkgDescription must not contain black lines between macros 
Otherwise that inserts a buggy "<p>" tag in the package overview where the
doctype does not allow it.
 2011-11-15 19:16:23 +00:00
Olivier Devillers f5636aa2fa merge next 2011-11-04 12:57:12 +00:00
Laurent Rineau 6ed56d75b5 merge from next 2011-10-25 15:48:02 +00:00
Andreas Fabri c5c387f45e workaround to avoid an unjustified warning of g++ 2011-10-24 13:21:59 +00:00
Laurent Rineau 13447f666c auto-link files must include <CGAL/config.h> 
<CGAL/config.h> includes <CGAL/compiler_config.h>, that is generated during
the build of libraries. CGAL_BUILD_SHARED_LIBS is defined in it.
 2011-10-24 09:23:21 +00:00
Olivier Devillers c239517f42 remove warning 2011-10-24 07:55:45 +00:00
Laurent Rineau c37ce187ff Factorize the settings of VERSION/SOVERSION properties of libraries 2011-10-19 15:53:46 +00:00
Laurent Rineau 338c6a9925 Update the export feature to non-Microsoft compilers 
Support the ELF visibility feature of gcc/icl/clang
 2011-10-18 16:53:54 +00:00
Laurent Rineau 9059b29647 Fix and factorize post-build commands on Windows 
The function build_cgal_library defined in
Installation/src/CMakeLists.txt now handles a lot more than before, to
factorize between the various */src/*/CMakeLists.txt files used to
build CGAL libraries.

For example, the definition of mangled names is now factorized in that
function.

Installation/src/CMakeLists.txt also sets the output directories for
runtime, shared libraries, and static libraries. DLLs will be created
in bin/ instead of lib/.
 2011-10-17 16:02:12 +00:00
Laurent Rineau 5946c69608 merge from next 2011-10-12 13:52:06 +00:00
Andreas Fabri 94191c33e7 fix a memory leak 2011-10-12 12:37:45 +00:00
Andreas Fabri 7566f2cdcc Max area k-gon is implemented for k=3; Additionally the input must be convex 2011-10-12 11:08:33 +00:00
Andreas Fabri 1211b00e3b bug fix: Check if item exists before removing it 2011-10-12 11:04:19 +00:00
Andreas Fabri f15a4f9957 more export statements 2011-10-12 10:26:21 +00:00
Laurent Rineau dfba14f23c Rename <CGAL/$LIB/export.h> to <CGAL/export/$LIB.h> 2011-10-12 09:43:19 +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
Laurent Rineau 4b355f0561 merge from next 2011-10-11 12:28:22 +00:00
Laurent Rineau 88ef561715 Fix the call to Q_INIT_RESOURCE 
For resources that are shipped by the CGAL_Qt4 library, one need to call
CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources
(exported by the CGAL_Qt4 DLL)
 2011-10-11 09:51:29 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Laurent Rineau b4bf4af75d One must include <CGAL/config.h> to use the macro CGAL_BUILD_SHARED_LIB 2011-10-10 11:49:39 +00:00
Andreas Fabri 99408ec652 Disambiguate beginning of comment 2011-10-06 19:49:16 +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
Andreas Fabri ebc4f53646 Add declspecs for Visual C++ so that we can build dlls 2011-10-06 13:14:17 +00:00
Andreas Fabri 18f16c77ba Add declspecs for Visual C++ so that we can build dlls 2011-10-06 12:20:14 +00:00
Sébastien Loriot 75999b64d9 remove executable property 2011-10-03 08:22:54 +00:00
Sébastien Loriot 554f62d411 remove executable property from copyright files 2011-10-03 08:18:16 +00:00
Andreas Fabri d10a333947 Add a file with the copyright holder(s) to the package_info 2011-09-29 20:45:16 +00:00
Laurent Rineau fdb7ea6c6b prepare ccPkgHowToCiteCgal for CGAL-3.10 (in 2012) 2011-09-28 16:15:05 +00:00
Sébastien Loriot eea04efa5f remove debug output 2011-09-27 15:40:56 +00:00
Sébastien Loriot 22d59a631a read constraints 2011-09-27 15:22:18 +00:00
Laurent Rineau c6b789ca60 Allow to load a .cgal file (result of the operator<< of a CDT) 2011-09-27 15:12:34 +00:00
Philipp Möller f9b288db90 Merged branch ^/branches/features/gsoc2011-copy_n-pmoeller. 
Small feature page: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Replace_copy_n
 2011-08-26 14:34:10 +00:00
Laurent Rineau 9fec0d4a60 Fix revision 64600 
The revision 64600 was the merge of next into the branch
features/Aos_2-new_functors-tau. For an unknown reason (maybe a buggy svn
version), that merge forgot to apply some revision of next. And those
revision were thus cancelled when the branch has been reintegrated back
into next.

I am trying to fix that. This branch is a copy of the branch
features/Aos_2-new_functors-tau@64599 where the merge of next has been
reapplied. Let's see what are the differences with the buggy revision
64000.
 2011-07-06 10:29:57 +00:00
Andreas Fabri 0a76c8f5d2 Add whitespace to avoid warning on closing comment 2011-06-29 10:58:44 +00:00
Laurent Rineau ac9877372d Update all PkgDescription files to CGAL-3.9 2011-06-27 14:31:45 +00:00
Eric Berberich fbc101fbb8 Merge from nextwq 2011-06-15 09:20:39 +00:00
Laurent Rineau acc2ae58a6 If CGAL_Qt4 is not a DLL, declspec must not be used. 2011-06-14 10:13:51 +00:00
Laurent Rineau 28bc7ca5c0 Add some decl spec (import|export) to CGAL_Qt4 
That allows to build libCGAL_Qt4 and the Polyhedron demo with
-fvisibility-ms-compat on Linux.

That may allow to build CGAL_Qt4 as a DLL on Windows, one day.
 2011-06-10 17:14:27 +00:00
Sébastien Loriot ed73c849d1 remove unused variable warning 2011-06-09 10:16:29 +00:00
Sébastien Loriot 218f4abf1d BUGFIX: when using clear button, really hide the rectangles 2011-06-09 08:36:32 +00:00
Sébastien Loriot dafa949e75 BUGFIX: do not run rectangular_p_center_2 if the number of points is less than p 
+cosmetic
 2011-06-08 13:39:09 +00:00
Sébastien Loriot 69b97b4ad2 remove unsed var warnings 2011-06-08 09:56:42 +00:00
Sébastien Loriot 75980ac1c0 remove unused var warnings 2011-06-08 09:53:06 +00:00