677ae4c7f4
CMake variables created by the branch-build are marked as advanced
2011-10-12 13:50:17 +00:00
87148361ff
Rename CGAL_BUILD_SHARED_LIB to CGAL_BUILD_SHARED_LIBS
...
Better name, and more coherent with CMake variable name:
BUILD_SHARED_LIBS
2011-10-11 13:52:25 +00:00
aa00f78883
Also support the compilation of CGAL libraries as static libs, with MSVC.
2011-10-06 16:01:16 +00:00
b28fb2f764
Remove debugging messages
2011-10-06 09:51:48 +00:00
cbfe32ce37
Add declspecs for Visual C++ so that we can build dlls
2011-10-05 19:12:23 +00:00
428e097ddc
Bump the soversion of CGAL libraries in CGAL-3.10
2011-09-28 12:43:22 +00:00
dbf3ace24b
merge from next
2011-09-22 07:56:49 +00:00
e773e4b5a7
CGAL_VERSION_NR was incorrect in hotbuild since 3.10
...
Now that CGAL_VERSION_MINOR is 10 (two digits), the CGAL_VERSION_NR
variable was not filled correctly in hot builds. That revision fixes that
issue.
2011-08-17 11:07:56 +00:00
70661bc1ef
SONAME/SOVERSION should not be in the cache
2011-07-20 14:16:21 +00:00
dac5ec1feb
Bump SONAME for CGAL-3.9
2011-07-20 14:04:16 +00:00
771760b538
Add the piece of CMake code to detect the URL of the current SVN branch
...
(Still to-do for Git...)
2011-06-10 09:59:27 +00:00
1787a34308
redo config tests if CMAKE_CXX_FLAGS has changed
2011-06-08 07:21:38 +00:00
bcdc7c3771
merge from next
2011-04-28 21:35:58 +00:00
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
026e830dec
merge from next
2011-04-28 10:51:25 +00:00
4b795c56f4
Global handling of CMake policies
...
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.
2011-04-28 10:33:17 +00:00
56c034b893
merge from next
2011-04-27 22:34:14 +00:00
5229c33964
Typo
2011-04-27 22:07:08 +00:00
2c81fa893d
Cosmetic: use lowercase for CMake commands, use functions instead of macros.
2011-04-27 21:24:29 +00:00
d827ed8d74
Add quotes in execute_process if the command name is a variable.
2011-04-27 21:16:42 +00:00
9274c3c09e
added todo
2011-04-26 09:26:46 +00:00
3dd1dec7a7
GMPXX only if not WIN32
2011-04-22 20:33:49 +00:00
1a4dbf894d
Avoid duplicates in CGAL_SUPPORTING_3RD_PARTY_LIRARIES when cmake is run
...
several times.
2011-04-22 16:20:42 +00:00
5f6ebda0cf
split RS3 from RS
2011-04-21 21:21:36 +00:00
6d0488eca3
merge from next
2011-04-21 14:28:02 +00:00
15b31230a7
added option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT
2011-04-21 14:25:13 +00:00
9bcf77ab04
fixed parsing of SVN_REVISION_NR for our french friends ;-)
2011-04-20 16:10:16 +00:00
db810b3c8c
mproved outout
2011-04-20 15:40:17 +00:00
72e82d7e9a
fixed usages for Prefix
2011-04-20 15:24:59 +00:00
e6b0ada67c
use correct prefix, handling of mandatory libs improved
2011-04-20 14:23:30 +00:00
2489f2d396
deal with library variable prefixes
2011-04-20 14:09:01 +00:00
fba0d339e7
cleanup
2011-04-20 10:17:01 +00:00
348e74b2ad
simplified external lib handling (not yet complete)
...
- 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
2011-04-19 22:45:54 +00:00
28cd8fc2a6
added list of supporting 3rd party libs
2011-04-18 08:46:51 +00:00
863f0c4de5
enable preconfiguration for external libs (for now only NTL, RS, MPFI), others to come
2011-04-17 19:55:06 +00:00
eb7a5ed11e
branch-build is now HOT on next ;-)
2011-04-15 09:12:06 +00:00
d92ca456a1
Minor: add a precision in the message about old versions of icl
2011-03-30 09:25:33 +00:00
421ea1c87a
typo: fix the whitespace
2011-03-29 15:36:37 +00:00
bfc2b1be9a
Tweak for Intel on Windows.
2011-03-29 15:35:40 +00:00
684fd15bd3
Add comments near the CMake policy we set.
...
Set the new policy CMP0017 of CMake-2.8.4 to OLD.
2011-03-09 13:33:08 +00:00
2afac8aac9
Fix CMakeLists.txt, ligne 319: the variable ${CMAKE_INSTALL_PREFIX} must be
...
quoted. It can contain special characters. For example, on Windows Vista 64
bits, by default, it is "C:/Program Files (x86)/CGAL".
2011-03-03 09:59:53 +00:00
014b308bbd
Bump the SONAME of CGAL-3.8. I have seen that at least CGAL::Random in
...
CGAL-3.8 is not binary compatible with CGAL::Random in CGAL-3.7 (there is a
new field).
2011-03-02 11:37:13 +00:00
9f9015e318
(Merge the branch /branches/candidate-packages/Installation)
...
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`
2010-11-03 18:16:16 +00:00
346386da4b
- Always install the man pages, even on Windows platforms, but if the
...
variable CGAL_INSTALL_MAN_DIR is set to an empty string.
- CGAL_INSTALL_DOC_DIR can also be set to an empty string.
- Fix a typo in the unused CPack section
2010-09-14 09:18:59 +00:00
58600297ff
Remove a display of CMAKE_INSTALL_PREFIX. IMO it was for debugging purpose,
...
and lasts.
2010-09-08 08:28:45 +00:00
fee353de5b
Re-enable CGAL_Core, even on 64 bits. 64 bits issues seem fixed, now.
2010-08-18 14:46:15 +00:00
e458164d0a
Merge the work from CGAL-3.7-branch:
...
| ------------------------------------------------------------------------
| 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.
|
| ------------------------------------------------------------------------
2010-08-10 11:55:00 +00:00
843ad3dafd
Update the comment: the SONAME of CGAL-3.7 libraries *will* be changed.
2010-07-01 16:31:07 +00:00
ad0bdedc35
Add comments, to explain SONAME/SOVERSION, and add an history of the
...
SOVERSION.
2010-07-01 16:29:30 +00:00
d72337785c
remove dependance on CGAL_PDB: merge from the branche created for that purpose
...
I do not remove the directory CGAL_PDB as I am allowed to use svn remove.
2010-06-10 17:26:38 +00:00
d7b05b2802
CMake's load_cache builtin command is rather dangerous. With the disabling
...
of CGAL_Core on 64 bits platforms, the old libCGAL_Core.so from the
reference platforms were somehow used and linked with binaries.
This is an attempt to work around that issue.
2010-05-28 09:47:49 +00:00
0bda1d5591
Disable CGAL_Core if void* is size 8 (ie 64 bits).
2010-03-19 14:15:25 +00:00
0e76060908
- Make CGAL_SOURCE_DIRECTORY available during CGAL configuration.
...
- Fix a typo (in an used if/then/else branch)
2010-03-19 13:46:49 +00:00
15382fb248
Prepare the bump of SONAME for CGAL-3.7.
2010-01-27 17:06:00 +00:00
4890f79afc
Merged revisions 53508 via svnmerge from
...
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch
........
r53508 | lrineau | 2009-12-19 14:02:00 +0100 (Sat, 19 Dec 2009) | 2 lines
Increase the soversion to 4.0.1
........
2009-12-22 13:16:05 +00:00
f07703e0b5
modified cmake scripts so MPFI and RS are not detected and configured at
...
installation
2009-12-11 11:27:54 +00:00
a1b7df03ee
integrated the configuration of RS to the main CMakeLists.txt, and removed
...
some redundant if's in the MPFI configuration
2009-12-09 15:38:43 +00:00
71f385de58
updated the cmake installation scripts to detect and configure MPFI
2009-12-08 17:09:15 +00:00
1df9ab9593
Disable the CPACK feature, that has never been supported.
2009-10-20 13:07:56 +00:00
f1a3f94274
Merge to trunk commits from CGAL-3.5-branch so far.
...
Merged revisions 50855,50859,50863,50868,50871,50878-50879,50886,50893,50930-50934 via svnmerge from
svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch
........
r50855 | lrineau | 2009-07-27 13:47:18 +0200 (Mon, 27 Jul 2009) | 1 line
Attempt to fix links to precompiled demos.
........
r50859 | lrineau | 2009-07-27 14:37:54 +0200 (Mon, 27 Jul 2009) | 2 lines
update the AUTHORS list
........
r50863 | lrineau | 2009-07-27 14:53:14 +0200 (Mon, 27 Jul 2009) | 3 lines
Remove occurences of "3.4" in various files (problem reported by
J. Reichel)
........
r50868 | lrineau | 2009-07-27 15:38:39 +0200 (Mon, 27 Jul 2009) | 2 lines
Fix target names conflicts with Triangulation_2.
........
r50871 | lrineau | 2009-07-27 15:48:57 +0200 (Mon, 27 Jul 2009) | 2 lines
Taucs will be updated for CGAL-3.5.
........
r50878 | lrineau | 2009-07-27 16:10:03 +0200 (Mon, 27 Jul 2009) | 2 lines
There was still a 3.4 in that file.
........
r50879 | lrineau | 2009-07-27 16:16:11 +0200 (Mon, 27 Jul 2009) | 2 lines
Fix a problem with \cgalrawversion{}: use "\cgalrawversion" instead!
........
r50886 | reichel | 2009-07-27 19:09:07 +0200 (Mon, 27 Jul 2009) | 2 lines
Set CGAL_SONAME_VERSION to 4 and CGAL_SOVERSION to 4.0.0.
........
r50893 | lsaboret | 2009-07-28 10:27:31 +0200 (Tue, 28 Jul 2009) | 2 lines
* Fixed include path.
* Fixed order of libraries: TAUCS must be listed before LAPACK.
........
r50930 | lrineau | 2009-07-29 11:58:00 +0200 (Wed, 29 Jul 2009) | 2 lines
Add periodic_3_demo to "make demos".
........
r50931 | lrineau | 2009-07-29 11:59:33 +0200 (Wed, 29 Jul 2009) | 2 lines
Add CGAL ipelets to "make demos".
........
r50932 | lrineau | 2009-07-29 12:57:59 +0200 (Wed, 29 Jul 2009) | 2 lines
Add the polyhedron demo to "make demos".
........
r50933 | lrineau | 2009-07-29 13:04:50 +0200 (Wed, 29 Jul 2009) | 2 lines
Add the points set demo to "make demos".
........
r50934 | lrineau | 2009-07-29 13:09:22 +0200 (Wed, 29 Jul 2009) | 2 lines
Make the windows installer fetch the manual from the right place!
........
2009-07-29 12:49:27 +00:00
04a4a8199d
fix typo in last revision
2009-07-09 10:01:08 +00:00
70dc69c7dc
Add /fp:strict and /fp:except- when using MSVC.
2009-07-09 10:00:07 +00:00
ab03f7cf80
Add support for the Intel Compiler version 11.0 and after:
...
-fp-model strict must be added to the compiler flags.
2009-07-09 09:55:53 +00:00
fdea117287
Removed _SECURE_SCL=0
2009-07-03 16:20:05 +00:00
247f2513c3
Use install(PROGRAMS...) to install scripts, instead of install(DIRECTORY..)
...
with the PERMISSIONS statement.
== Reason: that mail ==
Message-ID: <4A2D1852.5050308@itis.ethz.ch>
Date: Mon, 08 Jun 2009 15:55:30 +0200
From: Dominik Szczerba <dominik@itis.ethz.ch>
To: cgal-discuss@lists-sop.inria.fr
Subject: [cgal-discuss] small installation issue on linux (CGAL v3.4)
Reply-To: cgal-discuss@lists-sop.inria.fr
Hi,
While 'make install' a following error is issued:
CMake Error at cmake_install.cmake:55 (FILE):
file Problem setting permissions on directory "/usr/local/bin"
The properties of this folder are:
drwxrwxr-x 2 root staff 4096 2009-06-08 15:46 bin
which is certainly sufficient for any local install by a staff member.
By temporarilly changing the ownership of the folder to myself the
installation proceeds, but it changes the permissions to 'drwxr-xr-x',
which is not how it should be done. Is there a particular reason to do
it this way or is it simply overlooking?
with regards,
Dominik
--
You are currently subscribed to cgal-discuss.
To unsubscribe or access the archives, go to
https://lists-sop.inria.fr/wws/info/cgal-discuss
2009-06-09 14:04:24 +00:00
aa98a09949
Added flags for alpha
2009-03-11 19:12:20 +00:00
c773b9f74d
Install cmake macros in lib/CGAL/ instead of lib/CGAL-3.4/.
2009-01-21 17:12:45 +00:00
c5090b1fab
Add the installation of the man page.
2008-12-18 22:37:55 +00:00
1cbd734136
rename 'demo' target as 'demos'
2008-12-18 17:31:37 +00:00
4bc77dbb64
Also install AUTHORS.
2008-12-17 10:28:27 +00:00
5446a86713
Fix permissions of install scripts.
...
(Reported by Efi)
2008-12-16 17:31:16 +00:00
41bb417143
- CGAL cmake files are installed by default in
...
${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.
2008-12-11 15:24:51 +00:00
99e4540773
Added custom 'install_FindCGAL' target
2008-12-05 16:20:07 +00:00
6553984e9f
Turn OFF examples and demos by default because under Visual Studio this creates a solution with hundreds of projects
2008-11-28 21:20:19 +00:00
b06cc3fc0e
Moved cmake modules back (3/3)
2008-11-27 17:30:01 +00:00
eb788696c8
Fixed GNUCC->GNUCXX and detection of GCC
2008-11-07 16:46:03 +00:00
cf1febcab0
Add a comment to endif(), to avoid future problems.
2008-11-06 10:06:35 +00:00
0238a1c451
Put CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in the right place for cmake 2.4
2008-11-05 20:47:04 +00:00
11b5b28d0c
Install FindCGAL.cmake
2008-11-04 17:55:10 +00:00
fb446def12
Moved CGALConfig.cmake-.*.in down lib/CGAL.3,4
2008-11-04 15:58:45 +00:00
145ee41079
Prefixed CGAL cmake modules with CGAL_
2008-11-04 12:49:32 +00:00
6bae1045df
Fixed handling of flags when defined interactively
2008-11-03 21:00:22 +00:00
5175f3c926
Add USING before the cmake version, so that the result collection scripts
...
can retrieve that value.
2008-11-03 00:24:53 +00:00
a2b19b120d
Use ^4 and ^4.2 as regular expression, to be sure that we do not matches
...
another part of the version.
2008-10-31 15:03:03 +00:00
211deea81c
Removed WITH_INSTALL + doc update
2008-10-30 12:47:49 +00:00
d70bdaea18
Prefixed cmake variables with CGAL_
2008-10-23 14:59:02 +00:00
620de7792e
LEDA support integrated into CGAL itself
2008-10-17 19:04:04 +00:00
b3a611f4a0
(fixed) Allowed CGAL components to be configured and compiled independently
...
Make library naming consistent with component names
2008-10-02 18:13:13 +00:00
6fdf8251bd
Allowed CGAL components to be configured and compiled independently
...
Make library naming consistent with component names
2008-10-01 21:38:37 +00:00
d55fa891ea
Fix naming hell in 3RD_PARTY_*DIR (*DIRS or *DIR). I have choosen *DIRS.
2008-09-16 11:57:59 +00:00
cc25cb0130
Fixed unintended presistence of 3RD_PARTY cache variables
2008-09-15 16:25:09 +00:00
6364643bff
Funny mistake. "in" is not a known target. :-)
2008-09-15 07:50:29 +00:00
502c3f271f
Added libCGAL to libCGAL-Qt3
...
Avoid detecting flags at user-program configuration
2008-09-12 18:58:38 +00:00
3415870ee5
Factorise the 4-5 lines of code that create CGALConfig.cmake in a macro.
2008-09-09 12:07:36 +00:00
ab07405874
Use unique names for example, demo and test targets
...
Renamed CGAL-Qt as CGAL-Qt3
Re-spelled cgal components as CORE, ImageIO, PDB, Qt3 and Qt4
2008-09-04 18:58:09 +00:00
7df9287297
Sort support tests and examples/demos alphabetically
2008-09-04 14:28:53 +00:00
ee6fae2991
Added separation in components
2008-09-03 16:55:21 +00:00
fb8b306638
Fixed *REALLY ODD* problem with CMake not properly testing for CGAL_REFERENCE_DIR
2008-09-01 21:14:20 +00:00
6235cbb03f
Fix a missing new line (bug for MSVC only).
2008-09-01 11:57:14 +00:00
41251065c2
Fix pending problems with examples and demos (now possible to do 'make examples' or 'make demo' from CGAL_DIR)
2008-08-27 16:24:01 +00:00
cc3f3fbe4a
Added FindOpenGL.cmake stub to fix Mac Leopard's OpenGL.
2008-08-25 19:17:09 +00:00
717b7cf5fb
soversion added
2008-08-22 22:25:25 +00:00
a84b7f58a2
Fixed variable handling within subdirectories
2008-08-22 21:50:04 +00:00
4015b7f471
Enable back "C" language support... cmake itself seems to need it in TRY_COMPILE (I think it's a cmake bug...)
2008-08-22 18:15:05 +00:00
ee7cba9c38
Improved/Fixed dependencies and related CGAL_USE_* flags
...
OpenGL and QT3 are now searched by Qt_widget alone.
2008-08-22 17:47:49 +00:00
2f49a5f855
cgal.com -> cgal.org.
2008-08-19 16:18:33 +00:00
0949438e32
Improved autotest_cgal_with_cmake/collect_cgal_testresults_from_cmake for multiple hosts and platforms
2008-08-13 22:21:38 +00:00
302cec65f6
Worked around odd internal variable problem when loading a cache
2008-08-01 19:18:40 +00:00
56c402b0fe
Removed obsoleted cmake modules
...
Moved print_*_version to the right directory
Fixed prinout of boost and gmpxx version numbers
Automatically skip demos and example when running the testsuite
2008-07-17 14:03:25 +00:00
6e36eda87b
CMake stuff moved into the appropriate packages
2008-07-16 20:56:17 +00:00
Laurent Rineau
Andreas Fabri
Sébastien Loriot
Eric Berberich
Luis Peñaranda
Fernando Cacciola
Sylvain Pion