Commit Graph

1534 Commits

Author SHA1 Message Date
Eric Berberich 2f6dae6bbb now I got it: it's not just the first argument, it's the first file
"first" is a little bit general name for a parameter, changed
to firstfile and added a comment about handling other files
2012-08-03 12:57:04 +00:00
Eric Berberich 293a072b43 make signatures consistent 2012-08-03 12:46:58 +00:00
Eric Berberich 05c4d0a28f be consistent in variable name 2012-08-03 12:23:40 +00:00
Laurent Rineau 4c3e1c3138 Fix mixed eol styles 2012-08-02 13:35:03 +00:00
Laurent Rineau 6e579584b3 Fix FindRS(3) modules
A FindFoobar module must not include a UseFoobar file. CGAL_UseRS3 now
includes CGAL_UseMPFI, and not FindRS and FindRS3.

+ Fix also a typo in a message of FindRS3.
2012-08-02 10:32:04 +00:00
Laurent Rineau 414182edbf Change the order of messages, to be coherent with CGAL_UseRS(3) 2012-08-02 10:02:34 +00:00
Laurent Rineau cf1ad35e79 Better formatting of the documentation of GMP CMake modules 2012-08-02 09:50:24 +00:00
Laurent Rineau 514c1efad1 Make RS, MPFI, LEDA, and NTL optional essential libraries 2012-08-01 16:58:19 +00:00
Laurent Rineau de57846797 CGAL-4.1 will not support Intel Compiler 12.0, but 12.1 (the latest
non-beta)
2012-08-01 15:36:53 +00:00
Laurent Rineau 98992ea06b Use include_directories(SYSTEM ...) in the macro use_lib 2012-08-01 12:23:53 +00:00
Laurent Rineau 8e167590c8 Use include_directories(SYSTEM ...) for 3rd-party libraries
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.
2012-08-01 10:53:37 +00:00
Laurent Rineau 767899fa33 Revert some modifications made by error. 2012-07-31 16:41:10 +00:00
Efi Fogel c8a956f6a2 Added 2D Arrangements changes for 4.1 2012-07-31 07:19:28 +00:00
Laurent Rineau 9491693417 Fix an issue when BUILD_SHARED_LIBS is toggled
When the value of the Boolean cache variable BUILD_SHARED_LIBS is modified,
there was a bug that the variable CGAL_LIBRARY_NAME,
CGAL_Core_LIBRARY_NAME, CGAL_Qt4_LIBRARY_NAME, and so on, were not
updated. As a consequence, the file CGALConfig.cmake produced in the
installation directory was not correct: it was referring to .so files
whereas the installed binaries were .a files, or the reverse.

This patch fixes the issue.
2012-07-27 13:16:55 +00:00
Laurent Rineau a9cb96b42a Minor tweak to CMake messages during CGAL configuration
Before that patch, CGAL_SetupFlags was included in the stage:
  == Detect external libraries ==
Now there is a stage:
  == Set up flags ==
2012-07-26 10:51:05 +00:00
Laurent Rineau 20762313af Refresh the FindQt3-patched module, from CGAL, with recent changes
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).
2012-07-26 09:28:21 +00:00
Ophir Setter 628087b87a moc-qt3 to come before moc. Now, if moc is qt4 moc the cmake file will use the correct moc in Qt3 2012-07-26 07:08:26 +00:00
Laurent Rineau 6507b3fd24 Fix a typo (missing closing parenthesis) 2012-07-24 11:45:28 +00:00
Philipp Möller f330095286 Add Boost.System to the CGAL dependencies
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.
2012-07-24 10:02:57 +00:00
Eric Berberich 972f164184 correct handling of optional parameter for use_lib macro 2012-07-05 18:33:27 +00:00
Eric Berberich 397f0e4131 worked only if WITH_CGAL_Core=ON|OFF, but not if it's not given at all 2012-07-05 09:03:18 +00:00
Laurent Rineau 4953bbbc86 Remove buggy executable bits 2012-07-04 19:28:22 +00:00
Laurent Rineau 1bb23e6b09 Cherry-pick hot fixes from CGAL-4.0-branch:
| ------------------------------------------------------------------------
  | r70257 | lrineau | 2012-07-04 10:41:28 +0200 (Wed, 04 Jul 2012) | 1 line
  | Changed paths:
  |    M /branches/releases/CGAL-4.0-branch/Installation/CMakeLists.txt
  | 
  | Fix CMake error in public releases
  | ------------------------------------------------------------------------
  | r70259 | lrineau | 2012-07-04 11:22:12 +0200 (Wed, 04 Jul 2012) | 1 line
  | Changed paths:
  |    M /branches/releases/CGAL-4.0-branch/Installation/CHANGES
  |    M /branches/releases/CGAL-4.0-branch/Installation/changes.html
  | 
  | Update the changes.html
  | ------------------------------------------------------------------------
2012-07-04 09:36:41 +00:00
Laurent Rineau 8e725dc83a Intel Compiler 11 is no longer tested. 2012-07-03 11:06:19 +00:00
Eric Berberich bc6d9c1005 fixed typo: added missing '_' 2012-07-03 10:53:25 +00:00
Eric Berberich ef6fa7a32b Merge Script-improve_create_cmake-eric into next
Main changes are
- new installation manual
- distinction between essential and optional libraries
- preconfiguration of optional libraries possible
2012-07-02 15:56:15 +00:00
Laurent Rineau 9d180c5c22 Minor tweaks to the changes.html
I have reordered the entries, fixed a typo, and uniformized the use of the
verbs in the different entries.
2012-07-02 15:00:40 +00:00
Eric Berberich a488660748 rely on CMake list(FIND ...) instead of macro
Macro is nicer to use, but needs to be included and is less efficient.
To improve understanding: added comments
2012-06-29 23:13:43 +00:00
Eric Berberich 1d21969b14 revert use of macro and rely on list(FIND ...) 2012-06-29 22:53:42 +00:00
Eric Berberich 167783acde copy'n'paste works if the right includes exist: here missing CGAL_Macros
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 ...
2012-06-29 22:22:25 +00:00
Eric Berberich 3a7ad3baaa mandatory -> essential 2012-06-29 15:27:45 +00:00
Eric Berberich d4cb1c2212 SetupDependicies needs also to check for essential lib (not just WITH_<lib>), side effect: mandatory->essential 2012-06-29 15:24:30 +00:00
Eric Berberich d0d6335a79 added Eigen3_FIND_VERSION to search for minimal version
CGAL_Common.cmake is included at a very early stage 
- when configuring CGAL but also
- when configuring demos etc
2012-06-29 12:51:02 +00:00
Eric Berberich 87ebf20f51 need a certain order 2012-06-29 09:39:40 +00:00
Eric Berberich b5a4e941fd the mandatory libs need an particular order, and we simplify with a macro 2012-06-29 09:24:19 +00:00
Laurent Rineau 160975eb12 Leftover of previous commit:
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."
2012-06-28 15:57:29 +00:00
Laurent Rineau 483593826b 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."
2012-06-28 15:47:16 +00:00
Laurent Rineau 455fcb0109 Add a comment for later 2012-06-28 15:15:31 +00:00
Eric Berberich eb6c435c4a correct spelling of GMPXX_FOUND variable
FOUND_GMPXX -> GMPXX_FOUND
2012-06-28 13:02:32 +00:00
Eric Berberich 3336c68671 fix for optional parameter 2012-06-28 12:47:13 +00:00
Eric Berberich df72a1aa08 macro use_lib now has an optional second parameter for UseFile
this avoids a nasty hack with checking for a leading ### in a string and 
allows to use "use_lib( FOO )" in other places much easier
2012-06-28 12:20:52 +00:00
Eric Berberich ee0fde5d13 re-added files probably used by external users 2012-06-28 12:03:12 +00:00
Laurent Rineau bccf95ba88 Add a comment for later in CGAL_Macros.cmake 2012-06-27 16:33:35 +00:00
Eric Berberich cccbcac26c ensure that CGAL_USE_CORE is only defined when WITH_CGAL_Core=ON
in particular when WITH_CGAL_Core=OFF is shall not be defined
2012-06-27 13:57:55 +00:00
Eric Berberich d4a6f27503 replace calls to UseESTBL 2012-06-26 23:52:07 +00:00
Eric Berberich 67291a2c6d merge from next 2012-06-24 12:17:32 +00:00
Eric Berberich 3ae59a513c removed verbosity 2012-06-21 22:07:04 +00:00
Eric Berberich 00330ee225 GMP and MPFR are mandatory 2012-06-21 21:57:42 +00:00
Eric Berberich 5ed099f6c1 enable preconfig 2012-06-21 21:57:16 +00:00
Eric Berberich 6b78ca27d6 use lib instead of vlib to be consitent with WITH_Lib 2012-06-21 14:54:46 +00:00