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

73 Commits

Author SHA1 Message Date
Philipp Möller 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +01: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 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Sébastien Loriot 659dcd26b3 is_rational() from one_root_number is replaced by !is_extended() from Sqrt_extension 2011-05-02 10:13:35 +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
Marc Glisse e54d65ec06 Don't rely on the implicit conversion QString -> const char*. 
Don't do it on temporaries.
stddef.h missing in qt3 headers.
 2010-07-12 10:02:56 +00:00
Marc Glisse c95671e5a7 cleanup extra ';' 2010-04-24 09:01:22 +00:00
Fernando Cacciola 658360f4cb Update of the Qt4 boolean operations demo 2009-07-31 00:18:31 +00:00
Sylvain Pion 0f49d58e7d More DS -> DS_ renaming (outside include/CGAL as well, to fix the test-suite). 2009-04-30 13:39:06 +00:00
Efi Fogel ad970fa8e7 removed 2009-01-14 09:06:46 +00:00
Fernando Cacciola 24f08fc681 Added demos to the demos target 2008-12-18 17:29:36 +00:00
Fernando Cacciola 36218d21f7 Patched qt3_generate_moc calls to specify full path to moc sources (to allow out-of-build configurations) 2008-12-17 20:06:35 +00:00
Laurent Rineau b861e82892 Fix conditionnal compilation. Do not compile Qt3 demos if CGAL_Qt3 is not found. 2008-11-20 13:22:51 +00:00
Laurent Rineau 4032eade9a Massive removale of "QUIET" in find_package calls (except for 
FindVTK.cmake, which has a bug). Let's see if that can help us to find out
why we still have problems with demos on MacOS and Windows.
 2008-11-19 13:58:43 +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 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
Andreas Fabri 6340443886 Add QUIET to find_package 2008-10-01 12:26:28 +00:00
Laurent Rineau b52c7a09e9 - Fix soname and soversion of libraries (they were exchanged). 
- Make get_dependency_version found the print_${LIB}_version.cpp, even
  if the lib is compiled separately.
- Rename FindQt3.cmake to FindQt3-patched.cmake and Qt3Macros to
  Qt3Macros-patched.
- Make CGAL-Qt3 compilable separately.
- Fix all commited CMakeLists.txt:
    - use Qt3-patched and Qt3Macros-patched, and s/QT_/QT3_/
    - add a comment about FindQt3-patched,
    - wrap target creation with if(CGAL_FOUND AND QT3_FOUND)/else/endif
- Modified cgal_create_cmake_script
 2008-09-24 10:32:44 +00:00
Laurent Rineau f1b56f9a11 Fix some CMakeLists.txt (that use Qt3 or Qt4). 2008-09-22 11:59:21 +00:00
Andreas Fabri c6ab490a78 Added CMakeLists.txt 2008-09-18 14:06:41 +00:00
Laurent Rineau a9f67f82b5 4th pass to remove CGAL_USE_QT: remove "#ifdef CGAL_USE_QT"/"#endif" 2008-09-09 21:53:57 +00:00
Laurent Rineau a302cff5c8 Second pass to remove CGAL_USE_QT: remove "#ifndef CGAL_USE_QT"/"#else"/"#endif // CGAL_USE_QT" 2008-09-09 21:42:42 +00:00
Guy Zucker 1d5fa8d52f Turned global variables into class members to allow multiple windows to function properly. Had to make additional .h, .cpp files 2008-07-09 13:04:14 +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
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 afddfc4fca CMake scripts for demos/examples/test added 2008-02-06 19:06:24 +00:00
Efi Fogel 163e366b61 cleanup 2007-11-21 10:26:38 +00:00
Efi Fogel f17b5d1eaf API revisited 2007-11-21 10:24:10 +00:00
Shlomo Golubev 89feac2610 rename Arr_traits_2 to Arr_geometry_traits 2007-08-22 22:58:35 +00:00
Shlomo Golubev aed1bcb1aa work arounds for Envelope_3 2007-08-09 13:35:21 +00:00
Fernando Cacciola 88111fcf70 VS project files merged back 2007-06-06 15:35:17 +00:00
Andreas Fabri ea71b8eaa1 .C ->.cpp and autolinking 2007-04-11 13:59:20 +00:00
Andreas Fabri 647296fd67 removed unused parameter 2007-03-20 07:53:53 +00:00
Joachim Reichel d08f6bea45 replace obsolete variable CGAL_QT_LDFLAGS by CGAL_LDFLAGS 2007-03-11 09:54:17 +00:00
Sylvain Pion b2630cd7e1 Apply trailing whites-spaces and leadgin+trailing empty-lines cleanups 
to demo/**/*.h and .cpp.
 2007-03-10 16:55:12 +00:00
Sylvain Pion a8aa9c01b5 The great constificator strikes again ! 2007-03-08 10:54:20 +00:00
Andreas Fabri 8ce68b2531 derivation instead of typedef caused problem 2007-02-08 10:43:02 +00:00
Andreas Fabri aae4e18ffb A tribute to Redmond 2007-02-01 18:44:41 +00:00
Baruch Zukerman 25b24b2960 when opening a file, next time we open some file the previous location will be used 2006-11-22 14:32:32 +00:00
Baruch Zukerman ca95218f00 added option to read linear polygons, and some small fixes in the drawing 2006-11-22 13:45:33 +00:00
Baruch Zukerman 1d24698f4d added minkowsky sum 2006-11-20 13:36:09 +00:00
Baruch Zukerman d59da1d698 fixed some icons 2006-11-20 13:27:08 +00:00
Baruch Zukerman 9008d73c99 fixed the icon 2006-11-20 13:22:17 +00:00
Baruch Zukerman 92cd851d38 added minkowki sum icon 2006-11-20 13:08:19 +00:00