Commit Graph

82 Commits

Author SHA1 Message Date
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 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
Laurent Rineau 5229c33964 Typo 2011-04-27 22:07:08 +00:00
Laurent Rineau 2c81fa893d Cosmetic: use lowercase for CMake commands, use functions instead of macros. 2011-04-27 21:24:29 +00:00
Laurent Rineau d827ed8d74 Add quotes in execute_process if the command name is a variable. 2011-04-27 21:16:42 +00:00
Eric Berberich 9274c3c09e added todo 2011-04-26 09:26:46 +00:00
Eric Berberich 9bcf77ab04 fixed parsing of SVN_REVISION_NR for our french friends ;-) 2011-04-20 16:10:16 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Laurent Rineau d92ca456a1 Minor: add a precision in the message about old versions of icl 2011-03-30 09:25:33 +00:00
Laurent Rineau 421ea1c87a typo: fix the whitespace 2011-03-29 15:36:37 +00:00
Laurent Rineau bfc2b1be9a Tweak for Intel on Windows. 2011-03-29 15:35:40 +00:00
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 58600297ff Remove a display of CMAKE_INSTALL_PREFIX. IMO it was for debugging purpose,
and lasts.
2010-09-08 08:28:45 +00:00
Laurent Rineau fee353de5b Re-enable CGAL_Core, even on 64 bits. 64 bits issues seem fixed, now. 2010-08-18 14:46:15 +00:00
Laurent Rineau 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
Laurent Rineau 843ad3dafd Update the comment: the SONAME of CGAL-3.7 libraries *will* be changed. 2010-07-01 16:31:07 +00:00
Laurent Rineau ad0bdedc35 Add comments, to explain SONAME/SOVERSION, and add an history of the
SOVERSION.
2010-07-01 16:29:30 +00:00
Sébastien Loriot 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
Laurent Rineau 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
Laurent Rineau 0bda1d5591 Disable CGAL_Core if void* is size 8 (ie 64 bits). 2010-03-19 14:15:25 +00:00
Laurent Rineau 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
Laurent Rineau 15382fb248 Prepare the bump of SONAME for CGAL-3.7. 2010-01-27 17:06:00 +00:00
Laurent Rineau 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
Luis Peñaranda f07703e0b5 modified cmake scripts so MPFI and RS are not detected and configured at
installation
2009-12-11 11:27:54 +00:00
Luis Peñaranda 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
Luis Peñaranda 71f385de58 updated the cmake installation scripts to detect and configure MPFI 2009-12-08 17:09:15 +00:00
Laurent Rineau 1df9ab9593 Disable the CPACK feature, that has never been supported. 2009-10-20 13:07:56 +00:00
Laurent Rineau 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
Laurent Rineau 04a4a8199d fix typo in last revision 2009-07-09 10:01:08 +00:00
Laurent Rineau 70dc69c7dc Add /fp:strict and /fp:except- when using MSVC. 2009-07-09 10:00:07 +00:00
Laurent Rineau 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
Fernando Cacciola fdea117287 Removed _SECURE_SCL=0 2009-07-03 16:20:05 +00:00
Laurent Rineau 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
Fernando Cacciola aa98a09949 Added flags for alpha 2009-03-11 19:12:20 +00:00
Laurent Rineau c773b9f74d Install cmake macros in lib/CGAL/ instead of lib/CGAL-3.4/. 2009-01-21 17:12:45 +00:00
Laurent Rineau c5090b1fab Add the installation of the man page. 2008-12-18 22:37:55 +00:00
Fernando Cacciola 1cbd734136 rename 'demo' target as 'demos' 2008-12-18 17:31:37 +00:00
Laurent Rineau 4bc77dbb64 Also install AUTHORS. 2008-12-17 10:28:27 +00:00
Laurent Rineau 5446a86713 Fix permissions of install scripts.
(Reported by Efi)
2008-12-16 17:31:16 +00:00
Laurent Rineau 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
Fernando Cacciola 99e4540773 Added custom 'install_FindCGAL' target 2008-12-05 16:20:07 +00:00
Fernando Cacciola 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
Fernando Cacciola b06cc3fc0e Moved cmake modules back (3/3) 2008-11-27 17:30:01 +00:00
Fernando Cacciola eb788696c8 Fixed GNUCC->GNUCXX and detection of GCC 2008-11-07 16:46:03 +00:00
Laurent Rineau cf1febcab0 Add a comment to endif(), to avoid future problems. 2008-11-06 10:06:35 +00:00
Fernando Cacciola 0238a1c451 Put CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in the right place for cmake 2.4 2008-11-05 20:47:04 +00:00