Commit Graph

70 Commits

Author SHA1 Message Date
Sébastien Loriot 9e91e05d1b make demos working without gmp 2014-06-27 16:34:41 +02: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
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 c29e383991 Remove extra ';' 2010-09-22 06:21:53 +00:00
Marc Glisse 7f071aadc3 Qstring->[io]fstream 2010-07-17 17:24:20 +00:00
Andreas Fabri 4da5da5ab6 int -> unsigned int to get rid of warning 2010-03-01 07:54:14 +00:00
Efi Fogel 196e1aa79f Initialize a local variable - pacify g++ 2009-07-11 13:55:52 +00:00
Laurent Rineau cbcea273bb Fix the target name of the submitted CMakeLists.txt, so that cgal_test does
not return false.
2009-07-10 08:54:00 +00:00
Laurent Rineau bb3b717e61 readd a generated CMakeLists.txt 2009-07-09 14:38:57 +00:00
Efi Fogel 48346dc927 moved code to the header file, where the default application of moc expects it 2009-07-07 14:06:51 +00:00
Ophir Setter bc9ee2ca39 remove unneeded CMakeLists and adding a namespace 2009-05-26 20:48:38 +00:00
Efi Fogel 7effb23bc6 removed 2009-01-13 14:32:29 +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 49bf72b975 demo also depends on Core 2008-10-02 07:08:38 +00:00
Andreas Fabri 1ab4265a32 Add CMakeLists.txt 2008-10-01 13:27:31 +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
Ophir Setter 407aa15da8 compilation warning fix 2008-07-28 05:55:45 +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 828bf3fd8a Ported to new AOS 2007-11-28 17:39:33 +00:00
Efi Fogel 5667780f2a Used Arrangement_on_surface_2 2007-11-28 17:32:07 +00:00
Efi Fogel 4dc9a6924e cleanup 2007-11-16 22:06:54 +00:00
Shlomo Golubev 3fc6cf87bf replacing Hole with Inner_ccb and Arr_overlay.h with Arr_overlay_2.h 2007-08-20 05:12:27 +00:00
Fernando Cacciola 88111fcf70 VS project files merged back 2007-06-06 15:35:17 +00:00
Andreas Fabri c34341ee14 3.3 branch -> trunk 2007-06-04 14:38:31 +00:00
Ophir Setter 894d640ef6 Bug Fix: unbounded faces in plane lower envelope have not been drawen 2007-05-02 16:52:59 +00:00
Efi Fogel 0fabc7efcd fixed namespace of boost related constructs and functions 2007-04-04 17:12:45 +00:00
Efi Fogel 3939142fc3 fixed Faces_visitor 2007-04-04 10:36:41 +00:00
Efi Fogel fca8301eba pacify CYGWINNT-5.1_icl.exe-9.0 2007-03-30 08:33:04 +00:00
Efi Fogel 0ebc4c2bfc added const to icon arrays 2007-03-28 15:46:22 +00:00
Efi Fogel 0d9826231e renamed vertices to vertices_icon 2007-03-28 15:08:37 +00:00
Efi Fogel bc87611553 cleanup 2007-03-26 17:15:40 +00:00
Andreas Fabri 19b099b1cd removed unused parameter 2007-03-20 08:04:11 +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
Andreas Fabri d3a8cfaca7 derivation instead of typeded for VC++ 2007-02-16 10:43:29 +00:00
Efi Fogel 6aa177f6e4 cleanup 2007-02-02 12:32:53 +00:00