Commit Graph
109 Commits
Author SHA1 Message Date
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Andreas Fabri 89838c4639 Do not create isolated vertices 2020-09-10 11:45:44 +01:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0c2dcf7208 Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component. 2018-10-18 14:38:42 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Sébastien Loriot 7b22018963 move unused files to archive 2016-10-06 09:55:50 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Eric Berberich fdb1dc64a0 remove a warning on RUNNING_CGAL_AUTO_TEST 2012-10-22 14:53:39 +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
Laurent Rineau 3c02e07b23 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.
2011-04-28 17:45:22 +00:00
Laurent Rineau c97205f085 Global handling of CMake policies (second part)
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.

Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
Laurent Rineau 0631943153 Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:36:18 +00:00
Laurent Rineau ca5c92e034 Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
Andreas Fabri e1793f56f4 Add f to a floating point constant in order to suppress VC++ warning 2010-08-05 12:02:59 +00:00
Laurent Rineau 07c73ca08d Remove no-longer-used GNUmakefile (and deps) 2009-08-20 13:58:10 +00:00
Laurent Rineau df242c52e8 Remove no-longer-used GNUmakefile 2009-08-20 13:46:43 +00:00
Laurent Rineau af92177877 Merge:
//    
//    New Revision: 49507
//     Author: lrineau
//     Date: 2009-05-20 12:02:02 +0200 (Wed, 20 May 2009)
//     
//     Log message:
//     
//    Add a comment about the *squared* radius of the sphere.
//    
//    
//    Modified files
//    branches/CGAL-3.4-branch/Surface_mesher/examples/Surface_mesher/mesh_an_implicit_function.cpp
2009-05-20 10:08:13 +00:00
Laurent Rineau 8f0da95348 Fourth fix. :-( 2008-12-18 19:41:52 +00:00
Laurent Rineau fa912f218c Add NOTICE: where needed, so that the test results scripts can generate a "r". 2008-11-10 11:09:21 +00:00
Fernando Cacciola 547bffecd9 Put CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in the right place for cmake 2.4 2008-11-06 13:03:41 +00:00
Fernando Cacciola 994028ec51 Prefixed CreateSingleSourceCGALProgram.cmake with CGAL_ 2008-11-04 13:09:48 +00:00
Fernando Cacciola 70fa9503fd Added CMP0003 policy 2008-11-04 12:30:29 +00:00
Laurent Rineau f10a590672 Mass-remove vcproj files. 2008-10-21 09:21:22 +00:00
Laurent Rineau 9655708777 Submit a home-made CMakeLists.txt script, to add CGAL ImageIO in
dependencies.
2008-10-14 08:50:01 +00:00
Laurent Rineau 2656fde736 Fix typo. 2008-10-03 13:54:38 +00:00
Laurent Rineau e6eeb2d1a8 Remove auto-generated CMakeLists.txt 2008-10-02 11:12:51 +00:00
Andreas Fabri d254e5f188 Made custom CMakeList.txt file as applications need ImageIO 2008-09-09 14:08:52 +00:00
Laurent Rineau b420015e93 Fix parameters in the example. 2008-05-20 12:05:10 +00:00
Fernando Cacciola f93437ca22 Removed *unmodified* auto-generated CMakeLists.txt (now created by create_internal_release) 2008-05-05 14:01:55 +00:00
Laurent Rineau abec7d79bc Minor tweaks of GNU makefiles, not submitted, only for local uses. 2008-04-28 13:06:31 +00:00
Fernando Cacciola b704509dcf Examples/Demos/Test CMake scripts updated 2008-03-05 21:14:02 +00:00
Fernando Cacciola a659cd852a Added project() and conditional test for CGAL_DIR 2008-02-14 15:42:36 +00:00
Fernando Cacciola 14043c43a0 Replaced CGALROOT by CGAL_DIR (the latters is used by CMake automatically) 2008-02-08 17:47:21 +00:00
Fernando Cacciola 279eb55b13 Some cmake scripts for demos and examples fixed 2008-02-07 14:58:33 +00:00
Fernando Cacciola afddfc4fca CMake scripts for demos/examples/test added 2008-02-06 19:06:24 +00:00
Laurent Rineau 9f6d7c59d7 - Do not submit examples/Surface_mesher/polyhedron_remesher.cpp, that does
not compile, for now (it requires the octree).
- Remove examples/Surface_mesher/makefile, that no longer seems to be used.
2007-10-21 21:00:25 +00:00
Fernando Cacciola e96a837000 Example project files updated 2007-06-21 13:10:51 +00:00
Fernando Cacciola 8d2b0faf24 Merged back from 3.3-branch 2007-06-06 16:13:11 +00:00
Fernando Cacciola 88111fcf70 VS project files merged back 2007-06-06 15:35:17 +00:00
Laurent Rineau 37c7266f76 Merge the branch "temporary_branch_during_trunk_freeze" back to the trunk.
Details below (thank to svnmerge).

Merged revisions 38016,38018-38083,38085-38637 via svnmerge from 
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/temporary_branch_during_trunk_freeze/Surface_mesher

........
  r38022 | lrineau | 2007-04-10 15:11:14 +0200 (Tue, 10 Apr 2007) | 1 line
  
  no-op modifications
........
  r38023 | lrineau | 2007-04-10 15:13:06 +0200 (Tue, 10 Apr 2007) | 1 line
  
  add an intersection computation method to the polyhedral oracle: Triangle-curve
........
  r38026 | lrineau | 2007-04-10 16:14:12 +0200 (Tue, 10 Apr 2007) | 1 line
  
  use vectors instead of lists, and use the correct type Facet_circulator from C2t3
........
  r38028 | lrineau | 2007-04-10 16:18:48 +0200 (Tue, 10 Apr 2007) | 5 lines
  
  
  - Use sets or vectors instead of lists
  - Add marked edges
  - Marked edges are not removed when incident facets are removed.
    They are counted isolated, instead
........
  r38029 | lrineau | 2007-04-10 16:33:09 +0200 (Tue, 10 Apr 2007) | 2 lines
  
  typos
........
  r38306 | lrineau | 2007-04-18 17:58:24 +0200 (Wed, 18 Apr 2007) | 1 line
  
  new version, that should work, now. :-S
........
  r38327 | lrineau | 2007-04-19 03:13:46 +0200 (Thu, 19 Apr 2007) | 1 line
  
  add Edge_info into C2t3, and make the surfacic centers be cached into those edge infos
........
  r38328 | lrineau | 2007-04-19 03:36:21 +0200 (Thu, 19 Apr 2007) | 1 line
  
  forgot that part
........
  r38413 | lrineau | 2007-04-23 02:22:23 +0200 (Mon, 23 Apr 2007) | 1 line
  
  new version o Surface_mesher, with documentation.
........
  r38635 | lrineau | 2007-05-11 15:49:29 +0200 (Fri, 11 May 2007) | 1 line
  
  fix compilation
........
  r38636 | lrineau | 2007-05-11 15:49:52 +0200 (Fri, 11 May 2007) | 1 line
  
  updated documentation
........
  r38637 | lrineau | 2007-05-11 15:50:12 +0200 (Fri, 11 May 2007) | 1 line
  
  update for piecewise-smooth surfaces
........
2007-05-11 14:09:56 +00:00
Andreas Fabri ea71b8eaa1 .C ->.cpp and autolinking 2007-04-11 13:59:20 +00:00
Sylvain Pion ffe1e4ec1c More redundant filename removal.
The only survivors should be under Arrangement_2/examples
(some Doxygen syntax is used, so I don't touch them).
2007-03-10 15:22:41 +00:00