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.
to the FindQt3 module shipped with CMake
CGAL FindQt3-patched module uses the prefix QT3_ for all cache variables,
instead of just QT_. That allows to use Qt3 and Qt4 in the same project
(but for different binaries of course).
As of Boost 1.50 it is required to link Boost.System with CGAL. System
has been a Thread dependency all along and we simply never linked to
it and apparently got lucky.
Add it to the dependencies, add it in the manual and INSTALL file.
instead of including the file I've just added the general cmake makro to
check whether an item is in the list. Why does it need a macro? There should
be a list-operation for that ...
Second fix for Windows
On Windows, with auto-linking, the variables ${CGAL_LIB}_LIBRARY are
empty.
What is more, that is a bad idea to check if the libraries does exist. If
for example CGAL has been configured with WITH_CGAL_Qt4, and the CGAL_Qt4
library is not correctly created, we want a compilation error, and not just
a CMake warning saying "Please configure CGAL using WITH_${CGAL_LIB}=ON."
On Windows, with auto-linking, the variables ${CGAL_LIB}_LIBRARY are
empty.
What is more, that is a bad idea to check if the libraries does exist. If
for example CGAL has been configured with WITH_CGAL_Qt4, and the CGAL_Qt4
library is not correctly created, we want a compilation error, and not just
a CMake warning saying "Please configure CGAL using WITH_${CGAL_LIB}=ON."
| ------------------------------------------------------------------------
| r65982 | lrineau | 2011-10-20 17:49:05 +0200 (Thu, 20 Oct 2011) | 8 lines
| Changed paths:
| M /branches/next/Scripts/scripts/cgal_create_cmake_script
|
| Improvement of cgal_create_cmake_script
|
| This allows to create a CMakeLists.txt in a directory whereas the sources
| are in another directory.
|
| This will allow out-of-sources creation of CMakeLists.txt files. And, in
| the end, that will improve the branch-build.
|
| ------------------------------------------------------------------------
Make create_single_source_cgal_program() compatible with absolute paths
I have grepped for auto_link/(GMP|MFR)|AUTO_?LINK_(GMP|MPFR) and I removed
completely any support for auto-linking of GMP and MPFR from CGAL.
That is no longer necessary, nor relevant, no that we provide precompiled
GMP and MPFR libraries under standard names libgmp-10.lib and
libmpfr-4.lib.
To test in candidates:
Core
Installation
Number_types
| ------------------------------------------------------------------------
| r65557 | lrineau | 2011-09-26 16:49:02 +0200 (Mon, 26 Sep 2011) | 9 lines
| Changed paths:
| M /branches/next/Installation/cmake/modules/CGAL_UseBLAS.cmake
| M /branches/next/Installation/cmake/modules/CGAL_UseLAPACK.cmake
| M /branches/next/Installation/cmake/modules/FindBLAS.cmake
| M /branches/next/Installation/cmake/modules/FindLAPACK.cmake
| M /branches/next/Installation/doc_tex/Installation/installation.tex
|
| BLAS and LAPACK do not have header files.
|
| One implementation of BLAS or LAPACK can have a header file, but that is
| not mandatory for an implementation, and (hopefully) nothing in CGAL tries
| to include a blas.h or a lapack.h.
|
| The current revision removes mentions of BLAS_INCLUDE_DIR and
| LAPACK_INCLUDE_DIR in CGAL cmake scripts about BLAS and LAPACK.
|
|
------------------------------------------------------------------------
Reason:
For the implementation cblas/clapack, our use of that implementation does
need a header <blaswrap.h> to work.
CGAL_Boost_USE_STATIC_LIBS is now an (advanced) CMake option on all
platforms, and is stored in the generated CGALConfig.cmake. That way, its
value is proposed as the default value for the same option when programs
using CGAL are configured using CMake.
The script UseCGAL includes the module CGAL_TweakFindBoost, to define
Boost_USE_STATIC_LIBS and Boost_ADDITIONAL_VERSIONS.
Previously there was a variable CGAL_SHARED_LIBS defined by
CGALConfig.cmake. This one is now unified with CGAL_BUILD_SHARED_LIBS.
And the option CGAL_BUILD_SHARED_LIBS is only defined as an option if one
are building CGAL libraries. If CGAL_Common.cmake is included from another
project, such as from UseCGAL.cmake, then this variable is set in
CGALConfig.cmake as a regular (non-cached) CMake variable.
One implementation of BLAS or LAPACK can have a header file, but that is
not mandatory for an implementation, and (hopefully) nothing in CGAL tries
to include a blas.h or a lapack.h.
The current revision removes mentions of BLAS_INCLUDE_DIR and
LAPACK_INCLUDE_DIR in CGAL cmake scripts about BLAS and LAPACK.
*Add non-sparse matrix class (thus renamimg of the existing one)
*specialisation of the matrix class in Eigen_solver_traits according
whether this is a symmetric or asymmetric matrix
*update use-files of lapack and Taucs to get definitions
If CGAL_INSTALLATION_PACKAGE_DIR is not set in CGALConfig.cmake, then when
one compile a demo/example on Windows, Installation/auxiliary (where
precompiled version of some third party libraries should be put) cannot be
found and used. That replaces the old CMake variable CGAL_SOURCE_DIRECTORY
(before branch-build).
With this patch, when CGAL as been configured with WITH_examples and/or
WITH_demos, then the executables of examples and demos depends on the CGAL
libraries. That means if one change a file involved in a CGAL library, and
ask the rebuild of an executable, then the CGAL library will be rebuilt
first.
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.
- clean up CGALConfig files (gmp/mpfr version)
- special role of LEDA
- gmp/mpfr need version
- removed SetupGMP ;-)
- clean up Dependencies
- NTL without USE_FILE
- added mandatory libs
- Intel the Runtime Library (RTL) can be in a different directory from the
MKL library. That is why a new variable INTEL_RTL_LIB_DIR can be used to
indicate its path.
- On Linux with g++, -lm must be used at link time to use MKL (otherwise it
is not found).
Patch to trunk/Installation/ to display the full version message of the
compiler, if RUNNING_CGAL_AUTO_TEST is set (in the testsuite). That will
help to know which compiler are run by tests platforms.
Display also the result of `uname -a`
| ------------------------------------------------------------------------
| r57847 | lrineau | 2010-08-06 14:11:31 +0200 (Fri, 06 Aug 2010) | 4 lines
|
| Turn cgal_setup_module_path into a CMake function.
| Fix the CMake errors with CMake-2.6.0 and CMake-2.6.1 (VERSION_LESS if IF
| has been introduced in CMake-2.6.2).
| ------------------------------------------------------------------------
| r57816 | lrineau | 2010-08-05 15:56:57 +0200 (Thu, 05 Aug 2010) | 17 lines
|
| Clean the CMake configuration:
|
| - CGALConfig_install.cmake.source.in is removed. The variable
| SOURCE_INSTALL/CGAL_SOURCE_INSTALL were unused, and probably not tested
| for a long time (I found errors in
| CGALConfig_install.cmake.source.in). This has been cleaned.
|
| - CGALConfig_install.cmake.fhs.in is renamed (no .fhs. in it).
|
| - The module path is now modified in a macro (defined in
| CGAL_Macros.cmake), and the variable CGAL_CMAKE_MODULE_PATH is no
| longer stored or used in CGALConfig.cmake (the reason is that is was
| used as a path, where it is actually a list of paths).
|
| - The UseCGAL.cmake file only link with CGAL libraries that has been
| configured.
|
| ------------------------------------------------------------------------
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r56903 | lrineau | 2010-06-21 11:37:34 +0200 (Mon, 21 Jun 2010) | 2 lines
Search also for the name of mpfr-3.0.0 on Windows: libmpfr-4(.lib)
........
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r56833 | lrineau | 2010-06-17 12:02:47 +0200 (Thu, 17 Jun 2010) | 4 lines
Move the message "CGAL_Core needs GMP, cannot be configured." to the place
where CGAL_NO_CORE is set. That is more compatible with the disabling of
Core under 64 bits (on the trunk).
........
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r56724 | stayeb | 2010-06-14 09:01:34 +0200 (Mon, 14 Jun 2010) | 14 lines
Backport from trunk:
| New Revision: 56647
| Author: stayeb
| Date: 2010-06-08 17:28:21 +0200 (Tue, 08 Jun 2010)
| Log message:
| Try another workaround for VC++ and Intel compiler (CGAL::centroid). Add a call of overloaded CGAL::centroid function in test-suite.
| New Revision: 56702
| Author: stayeb
| Date: 2010-06-11 09:41:10 +0200 (Fri, 11 Jun 2010)
| Log message:
| Fix VC++ workaround (tested with MSVS2005)
........
r56795 | lrineau | 2010-06-16 15:05:02 +0200 (Wed, 16 Jun 2010) | 35 lines
Backport fixes for VC10 from trunk:
| ------------------------------------------------------------------------
| r56726 | afabri | 2010-06-14 09:11:59 +0200 (Mon, 14 Jun 2010) | 1 line
| Changed paths:
| M /trunk/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h
|
| For VC-10 we have to change FT* to cpp0x<>::const_iterator
| ------------------------------------------------------------------------
| ------------------------------------------------------------------------
| r56758 | lrineau | 2010-06-14 22:29:51 +0200 (Mon, 14 Jun 2010) | 11 lines
| Changed paths:
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
|
| Remove extra typename (broken testsuite) after revision 56725:
| | ------------------------------------------------------------------------
| | r56725 | afabri | 2010-06-14 09:08:25 +0200 (Mon, 14 Jun 2010) | 1 line
| | Changed paths:
| | M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
| | M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
| | M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
| |
| | For VC-10 we have to change FT* to cpp0x<>::const_iterator
| | ------------------------------------------------------------------------
| ------------------------------------------------------------------------
| r56725 | afabri | 2010-06-14 09:08:25 +0200 (Mon, 14 Jun 2010) | 1 line
| Changed paths:
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
|
| For VC-10 we have to change FT* to cpp0x<>::const_iterator
| ------------------------------------------------------------------------
........
r56796 | lrineau | 2010-06-16 15:10:30 +0200 (Wed, 16 Jun 2010) | 2 lines
Commit CHANGES for support of VC10.
........
r56797 | lrineau | 2010-06-16 15:14:49 +0200 (Wed, 16 Jun 2010) | 1 line
Commit mergeinfo stuff.
........
r56798 | lrineau | 2010-06-16 15:31:05 +0200 (Wed, 16 Jun 2010) | 60 lines
Backport from trunk the changes to the GMP/MPFR support on Windows:
- autolink now depends on CMake options CGAL_AUTO_LINK_GMP and
CGAL_AUTO_LINK_MPFR (default to ON).
- the environment variables GMP_INC_DIR GMP_LIB_DIR MPFR_INC_DIR
MPFR_LIB_DIR are used *before* searching into auxilary/gmp/.
- search names for libraries now includes libmpfr-1 and libgmp-10 (names
of Windows libraries obtained from the compilation of gmp-5.0.1 and
mpfr-2.4.2).
List of backported commits:
| ------------------------------------------------------------------------
| r56751 | lrineau | 2010-06-14 18:47:06 +0200 (Mon, 14 Jun 2010) | 6 lines
| Changed paths:
| M /trunk/Installation/cmake/modules/CGALConfig_binary.cmake.in
| M /trunk/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
| M /trunk/Installation/cmake/modules/CGAL_SetupGMP.cmake
| M /trunk/Installation/cmake/modules/FindGMP.cmake
| M /trunk/Installation/cmake/modules/FindMPFR.cmake
|
| Reintegrate the work of /branches/unsorted-branches/Test-no_autolink-for-gmp_mpfr-branch/Installation:
|
| If(MSVC), create CMake variables CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_GMP
| that can be set to OFF to disable the autolinking for GMP and MPFR. Those
| variables are stored in the cache, and in CGALConfig.cmake
|
| ------------------------------------------------------------------------
| r56752 | lrineau | 2010-06-14 18:51:25 +0200 (Mon, 14 Jun 2010) | 1 line
| Changed paths:
| M /trunk/Installation/cmake/modules/CGALConfig_install.cmake.fhs.in
| M /trunk/Installation/cmake/modules/CGALConfig_install.cmake.source.in
|
| Patch all CGALConfig*.in the same way.
| ------------------------------------------------------------------------
| r56775 | lrineau | 2010-06-15 19:25:37 +0200 (Tue, 15 Jun 2010) | 3 lines
| Changed paths:
| M /trunk/Installation/cmake/modules/FindGMP.cmake
| M /trunk/Installation/cmake/modules/FindMPFR.cmake
|
| Fix the library names hints of gmp and mpfr in FindMPFR.cmake and
| FindGMP.cmake
|
| ------------------------------------------------------------------------
| r56777 | lrineau | 2010-06-15 20:10:23 +0200 (Tue, 15 Jun 2010) | 2 lines
| Changed paths:
| M /trunk/Installation/cmake/modules/FindGMP.cmake
|
| The env variable must be searched *before* auxiliary/gmp/...
|
| ------------------------------------------------------------------------
| r56778 | lrineau | 2010-06-15 20:10:56 +0200 (Tue, 15 Jun 2010) | 2 lines
| Changed paths:
| M /trunk/Installation/cmake/modules/FindMPFR.cmake
|
| Search the library also in auxiliary/gmp, even if autolink=OFF.
|
| ------------------------------------------------------------------------
........
r56808 | lrineau | 2010-06-16 18:10:11 +0200 (Wed, 16 Jun 2010) | 4 lines
Set CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_MPFR defaults to FALSE if MSVC10
(because GeometryFactory has not generated any autolink-enabled binaries
of gmp and mpfr for msvc-2010).
........
If(MSVC), create CMake variables CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_GMP
that can be set to OFF to disable the autolinking for GMP and MPFR. Those
variables are stored in the cache, and in CGALConfig.cmake
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r54278 | lrineau | 2010-02-23 15:14:42 +0100 (Tue, 23 Feb 2010) | 2 lines
Minor fix of the layout: add a eol.
........
r54279 | lrineau | 2010-02-23 15:16:53 +0100 (Tue, 23 Feb 2010) | 2 lines
Add Naama Mayer as author.
........
r54280 | lrineau | 2010-02-23 15:18:49 +0100 (Tue, 23 Feb 2010) | 5 lines
Add more versions to _Boost_KNOWN_VERSIONS
(Well, in my opinion we should use Boost_ADDITIONAL_VERSIONS instead of
patching FindBoost.cmake!)
........
r54284 | lrineau | 2010-02-23 15:27:31 +0100 (Tue, 23 Feb 2010) | 2 lines
It is time to create candidates for CGAL-3.6-beta1
........
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r54256 | lrineau | 2010-02-22 14:28:24 +0100 (Mon, 22 Feb 2010) | 2 lines
Typo (\rs eat a space)
........
r54261 | lrineau | 2010-02-22 16:32:27 +0100 (Mon, 22 Feb 2010) | 3 lines
Add _Boost_COMPILER_DUMPVERSION is a macro and not a function, there is no
need for PARENT_SCOPE!
........
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r53794 | spion | 2010-01-26 11:02:56 +0100 (Tue, 26 Jan 2010) | 6 lines
Undo revision 53764, since it triggered problems in the Surface_mesher test-suite
(probably a bug there, but it's a bit late to investigate before 3.6-beta) :
Improve locate() reproducibility. (backport of trunk's revision 53763).
........
r53805 | spion | 2010-01-26 17:09:59 +0100 (Tue, 26 Jan 2010) | 9 lines
Backport trunk revisions 53799 and 53804 :
Make locate() deterministic using Boost RNGs.
The previous approach using a local CGAL::Random failed because it still uses a
global state through drand48()...
Replace CGAL::Random by Boost RNG (with geometric distribution)
in the hierarchy as well, to avoid global state sharing issues.
........
r53807 | penarand | 2010-01-26 19:32:31 +0100 (Tue, 26 Jan 2010) | 3 lines
set RS compilation flag in Mac OS when using g++<4.3
........
r53812 | penarand | 2010-01-27 09:32:13 +0100 (Wed, 27 Jan 2010) | 3 lines
removed extra ';' from _test_polynomial_traits_d.h
........
r53818 | lrineau | 2010-01-27 14:43:08 +0100 (Wed, 27 Jan 2010) | 8 lines
Merge from trunk:
| ------------------------------------------------------------------------
| r53811 | afabri | 2010-01-27 09:20:18 +0100 (Wed, 27 Jan 2010) | 1 line
|
| Switch from CGAL::Random to boost::rand48 as T3 did so
| ------------------------------------------------------------------------
........
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r53764 | spion | 2010-01-25 13:15:16 +0100 (Mon, 25 Jan 2010) | 2 lines
Improve locate() reproducibility. (backport of trunk's revision 53763).
........
r53765 | mcaroli | 2010-01-25 13:33:15 +0100 (Mon, 25 Jan 2010) | 5 lines
Remove iterator range removal: The implementation was inefficient and cannot be made
efficient easily because there is a problem with the iterator consistency
while computing in 27-sheeted covering: One call to remove removes all
27 copies of a point which might make the iterator invalid.
........
r53767 | mcaroli | 2010-01-25 15:08:56 +0100 (Mon, 25 Jan 2010) | 2 lines
cleanup in the preconditions
........
r53769 | penarand | 2010-01-25 15:35:43 +0100 (Mon, 25 Jan 2010) | 3 lines
moved GMP version check to FindRS.cmake
........
New Revision: 47740
Author: lrineau
Date: 2009-01-19 10:49:27 +0100 (Mon, 19 Jan 2009)
Log message:
Fix the installation manual, after feedback from CGAL developers.
r47647 | lrineau | 2009-01-05 15:48:29 +0100 (Mon 05 Jan 2009) | 4 lines
Fix buggy behaviour of FindQGLViewer.cmake, which sets QGLVIEWER_LIBRARIES
in the cache, to empty string if QGLViewer is not found. Then, the next
configuration step does not override the variable.
${CMAKE_INSTALL_PREFIX}/lib/CGAL-3.4 (but on Windows)
- The generated CGALConfig.cmake (from CGALConfig_install.fhs.cmake has
been modified so that it no longer refers to the source directory.
FindBLAS.cmake and FindLAPACK.cmake in CMake 2.6.
The result is more or less equivalent to install_cgal's behavior.
TODO:
- use a C++ compiler instead of a Fortran one
- try to be compatible with CMake 2.4
- find CBLAS (http://www.netlib.org/cblas)?
Jet_fitting_3 and Surface_mesh_parameterization compile now with CMake
(tested on Linux/gcc and Windows/VC++ 2005).
- 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
Moved print_*_version to the right directory
Fixed prinout of boost and gmpxx version numbers
Automatically skip demos and example when running the testsuite
Laurent Rineau
Ophir Setter
Philipp Möller
Eric Berberich
Sébastien Loriot
Andreas Fabri
Luis Peñaranda
Stéphane Tayeb
Laurent Saboret
Fernando Cacciola