Commit Graph

67 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
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Laurent Rineau c098632060 Remove that old makefile 2010-01-29 11:15:43 +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
Laurent Rineau ff7490e805 CreateSingleSourceCGALProgram has been prefixed by CGAL_. 2008-11-05 13:18:17 +00:00
Fernando Cacciola 29000b40d1 Removed more obsoloted cmake modules 2008-11-04 12:56:36 +00:00
Fernando Cacciola 70fa9503fd Added CMP0003 policy 2008-11-04 12:30:29 +00:00
Laurent Rineau acec34f797 Fix CMakeLists.txt (error reported by cmake-2.6). 2008-10-30 10:37:55 +00:00
Laurent Rineau f10a590672 Mass-remove vcproj files. 2008-10-21 09:21:22 +00:00
Laurent Rineau a6ef54dcec Fix conditional compilation. 2008-10-02 11:00:09 +00:00
Laurent Rineau 6e2da1578f Fix to please cmake-2.6. 2008-10-02 08:13:56 +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 410f435d21 6th pass to remove CGAL_USE_QT: remove "#ifdnef CGAL_USE_QT"/"#else"/"#endif" 2008-09-09 22:20:48 +00:00
Laurent Rineau c9e35521e9 5th pass (manually) to remove CGAL_USE_QT: remove "#ifdnef CGAL_USE_QT"/"#endif" 2008-09-09 22:17:19 +00:00
Laurent Rineau 7dee76b1ab Third pass (manually) to remove CGAL_USE_QT 2008-09-09 21:46:21 +00:00
Peter Hachenberger 0cb5ed7ee1 uses nary intersection + indexed items 2008-08-23 17:28:34 +00:00
Peter Hachenberger 5163d36b6c works with indexes, now 2008-08-23 17:27:47 +00:00
Peter Hachenberger 39d050af5e removed redundant template parameter Items 2008-08-11 13:43:58 +00:00
Peter Hachenberger ece33a9fe5 visual hull with indexes 2008-07-14 18:52:08 +00:00
Fernando Cacciola f030a7e598 autogenerated cmake script manually fixed 2008-02-28 13:37:08 +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
Andreas Meyer fdeedcf8b0 some low level code cleanup. renamed
* CGAL_error to CGAL_error_msg
* introduced a macro CGAL_error()
* added some words about CGAL_error to the developers manual
* renamed most of assert(x) into CGAL_assertion(x)
* renamed exit(x) with x != 0 , CGAL_assertion(false) and assert(false) into CGAL_error
* CORE left untouched, OpenNL changed
2007-11-07 16:51:18 +00:00
Fernando Cacciola 88111fcf70 VS project files merged back 2007-06-06 15:35:17 +00:00
Andreas Fabri 9e6232725d demos need a makefile 2007-05-04 16:29:19 +00:00
Peter Hachenberger 94aa16b98b makefile not needed any more 2007-04-25 12:39:38 +00:00
Peter Hachenberger 3db1a1d162 replaced the demo by three demos, such that user
feels free to use different kernels
2007-04-18 14:31:06 +00:00
Andreas Fabri ea71b8eaa1 .C ->.cpp and autolinking 2007-04-11 13:59:20 +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
Michael Hoffmann 384b656c73 Remove OPENGL_LIBS. 2007-02-07 16:01:49 +00:00
Andreas Fabri 44e6a483f1 changed .C to .cpp in examples 2006-07-09 19:32:06 +00:00
Andreas Fabri 777c54eb7d Removed gmp.lib and mpfr.lib as it gets linked via a pragma 2006-05-01 15:58:34 +00:00
Andreas Fabri f1d5337c4a Changed to subsystem:console 2006-04-27 11:23:44 +00:00
Andreas Fabri a2273dc4da Initial version of vcproj files 2006-04-27 11:21:18 +00:00
Laurent Saboret 87d65f75e3 Fixed svn properties of ASCII files (as defined by Maintenance/svn_client/config) 2006-04-18 12:42:52 +00:00
Andreas Fabri 95230146d0 deICEing for Visual C++ 2006-03-22 17:09:45 +00:00
Peter Hachenberger 42f15dc77c erased error output 2006-03-22 16:59:00 +00:00
Peter Hachenberger 81ffe69398 visual_hull now tells the user how to use it 2006-03-21 13:51:29 +00:00
Andreas Fabri 2d37935ddc juggling with typedefs to get rid of VC++ ICE 2006-03-21 12:28:14 +00:00
Andreas Fabri c37d17aa82 qualified make_pair with std:: 2006-03-20 09:23:51 +00:00
Peter Hachenberger 7fab4d81f1 #ifdef => ifndef 2006-03-19 14:51:50 +00:00