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
Eric Berberich
7973423691
prefix is a variable
2012-06-21 14:54:17 +00:00
Sébastien Loriot
d67be721d4
write prefix exception into config file and use default one otherwise for find_package
2012-06-21 14:27:35 +00:00
Sébastien Loriot
feb507b15f
changelog for 69918
2012-06-21 14:08:01 +00:00
Sébastien Loriot
3efc565b71
bug in prefix setting
2012-06-21 12:42:08 +00:00
Sébastien Loriot
b5ac8afe11
add comment
2012-06-21 12:04:22 +00:00
Laurent Rineau
0aba4d0010
Fix the parsing of the VERSION file
...
In case of a build from a release tarball, the parsing of the VERSION file
was not correct. This patch tries a better solution.
2012-06-21 10:34:46 +00:00
Sébastien Loriot
c2240ede0e
fix for ignoring preconfig
2012-06-21 09:53:03 +00:00
Sébastien Loriot
5dd3045330
move installation dir setup in demo script
2012-06-21 09:51:55 +00:00
Eric Berberich
4bdf466f9d
Request by Sebastien Loriot: Ignore a preconfig lib
2012-06-21 07:58:51 +00:00
Sébastien Loriot
e7e15113ef
modification for IPE
...
->move the version check and the installation directory detection into the
demo CMakeLists.txt
2012-06-20 15:12:28 +00:00
Eric Berberich
3fde316a6c
added CGAL_ENABLE_PRECONFIG (the default value has to be determined)
2012-06-20 11:16:17 +00:00
Eric Berberich
7a9557e414
fixed typo
2012-06-19 11:41:10 +00:00
Sébastien Loriot
7b5902c9f6
default IPE_VERSION to AUTODETECT
2012-06-19 09:36:04 +00:00
Eric Berberich
ed88f4e0e2
added comments
2012-06-19 08:26:16 +00:00
Eric Berberich
b918c8d88d
merge from next
2012-06-18 08:37:55 +00:00
Laurent Rineau
feefea9008
fix a typo in changes.html
2012-06-15 13:06:49 +00:00
Laurent Rineau
627fef95d5
Add the link to notes for CGAL 4.1
2012-06-15 12:11:40 +00:00
Laurent Rineau
108e4e5f16
Update release notes for CGAL 4.0.1
2012-06-15 12:10:48 +00:00
Eric Berberich
70fbefe00f
fix for QGLViewer or QGLVIEWER (AHHHHHH!)
2012-06-14 16:56:36 +00:00