Commit Graph

109 Commits

Author SHA1 Message Date
Laurent Rineau 6e731a1656 Merged revisions 53711,53718,53720,53724-53725,53728-53729,53731 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53711 | lrineau | 2010-01-20 21:36:47 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Fix for Debian: Qt4 QGLViewer library is /usr/lib*/libqglviewer-qt4.so
........
  r53718 | lrineau | 2010-01-21 17:57:41 +0100 (Thu, 21 Jan 2010) | 10 lines
  
  Merge from trunk:
    |  New Revision: 53717
    |  Author: afabri
    |  Date: 2010-01-21 17:51:49 +0100 (Thu, 21 Jan 2010)
    |  
    |  Log message:
    |  
    |  Add operator for MSVC 2005/2008 to avoid a matching ambiguity
........
  r53720 | lrineau | 2010-01-21 18:06:33 +0100 (Thu, 21 Jan 2010) | 2 lines
  
  Merge r53719 from trunk (VC workaround)
........
  r53724 | lrineau | 2010-01-22 13:34:50 +0100 (Fri, 22 Jan 2010) | 10 lines
  
  Merge from trunk:
    |  New Revision: 53723
    |  Author: afabri
    |  Date: 2010-01-22 13:28:06 +0100 (Fri, 22 Jan 2010)
    |  
    |  Log message:
    |  
    |  Just FK would be nicer, but VC 2005 messes it up with an FK in a base class when compiling degenerate_test.cpp
    | 
........
  r53725 | lrineau | 2010-01-22 13:44:11 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Cartesian<float> gives warnings (about truncation from double to float).
........
  r53728 | lrineau | 2010-01-22 14:26:40 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Fix bashism ==
........
  r53729 | lrineau | 2010-01-22 15:10:25 +0100 (Fri, 22 Jan 2010) | 3 lines
  
  Re-add g++-3.4 in the list of supported compilers (to be synced with the
  testsuite and the CGAL web site).
........
  r53731 | lrineau | 2010-01-22 16:09:52 +0100 (Fri, 22 Jan 2010) | 11 lines
  
  Merge fmo trunk:
    | ------------------------------------------------------------------------
    | r53730 | afabri | 2010-01-22 16:07:59 +0100 (Fri, 22 Jan 2010) | 1 line
    | Changed paths:
    |    M /trunk/Spatial_searching/doc_tex/Spatial_searching/intro.tex
    |    M /trunk/Spatial_searching/doc_tex/Spatial_searching/main.tex
    | 
    | Moved ccAuthor right after the title
    | ------------------------------------------------------------------------
    | 
........
2010-01-22 15:16:54 +00:00
Stéphane Tayeb c5db736efc Fix FindBoost.cmake:
+ fix compiler name (cmake 2.4.x)
  + boost search is now performed in user defined directories first (instead
  of in system default directories first)
2010-01-20 12:51:32 +00:00
Luis Peñaranda 3e771b9339 corrected bug in RS detection (old library name) 2010-01-18 15:20:55 +00:00
Sébastien Loriot 02f5ff8556 update cmake script to find ipe7 2009-12-29 19:07:56 +00:00
Luis Peñaranda 8940610f5a eliminated workaround for ppc 2009-12-21 15:20:09 +00:00
Luis Peñaranda b44bb688d4 updated cmake scripts to configure the new version of RS 2009-12-19 23:45:13 +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 f3e89da72b moved cmake scripts that detect and configure RS from
branches/candidate-packages/Algebraic_kernel_d/cmake/modules to
trunk/Installation/cmake/modules
2009-12-09 15:15:55 +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 55c19faa28 Fix FindMPFR.cmake and FindGMP.cmake: if CGAL_AUTO_LINK_ENABLED is false,
the library is found only if *_LIBRARIES is set.
2009-12-08 17:01:58 +00:00
Luis Peñaranda 79a9c26f90 moved cmake scripts that detect and configure MPFI to trunk/Installation 2009-12-08 16:18:17 +00:00
Laurent Saboret 744704e814 Port to Linux/g++ 4.3.1 2009-10-02 08:22:04 +00:00
Laurent Saboret 6d190df9d5 CMake modules to find and link with Intel MKL (including Pardiso) 2009-10-01 10:38:22 +00:00
Laurent Saboret c7f102ece4 Bug fix: fixed MKL support in FindBLAS.cmake and FindLAPACK.cmake 2009-10-01 10:36:15 +00:00
Laurent Rineau b6f567e260 add a new cmake variable in CGALConfig.cmake, so that one can detect if CGAL_ImageIO is build with ZLIB support. Use that variable in examples/Mesh_3/. 2009-07-23 15:02:02 +00:00
Sébastien Loriot 85d262491d move FindIPE to install dir 2009-06-30 09:06:26 +00:00
Eric Berberich 2684052dd5 added modified file for qt4 all-source cmake 2009-06-21 13:22:19 +00:00
Fernando Cacciola 84a42139c0 Added back the fix for missing flags on demos, examples and tests 2009-04-27 14:32:55 +00:00
Fernando Cacciola 48964c77a1 Re-removed CMAKE_VERBOSE_MAKEFILE=ON 2009-04-08 14:22:17 +00:00
Fernando Cacciola 1d2d7a3428 Removed totally useless cmake_policy (VERSION) command 2009-04-07 13:30:47 +00:00
Fernando Cacciola 6fcfa43cd7 Fixed find_package bug in 2.6.3 2009-04-06 13:34:12 +00:00
Fernando Cacciola b0be205def Patch FindBoost.cmake to be compatible with cmake 2.4 2009-03-16 15:47:38 +00:00
Fernando Cacciola edd41e098e Patched FindBoost to detect more versions of boost 2009-03-13 18:01:33 +00:00
Fernando Cacciola d205184e8d Patched FindBoost to detect more versions of boost 2009-03-13 03:15:48 +00:00
Fernando Cacciola e6840fac9c Removed 3.4 suffix 2009-03-11 19:09:25 +00:00
Fernando Cacciola fd1301b7c0 Replaced hardcoded CMAKE_VERBOSE_MAKEFILE with make VERBOSE=ON in the testsuite 2009-03-10 18:28:56 +00:00
Fernando Cacciola dd4aadc373 Fixed loosing flags when configuring demos and examples at once 2009-03-10 18:16:10 +00:00
Laurent Rineau 82a3893559 Merge from branch:
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.
2009-01-19 10:11:04 +00:00
Laurent Rineau 939aa4304d Merge from branch 3.4:
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.
2009-01-05 14:49:32 +00:00
Fernando Cacciola 6f52d14e4d Added current binary directory to each demo/examples to find .moc files 2008-12-17 19:44:21 +00:00
Laurent Rineau 2d8f66d8be That should fix the problem with strange characters, such as "(", in the
sources directory.
2008-12-17 15:28:54 +00:00
Laurent Rineau 0c827a8010 Fix a bad copy-paste: s/QGLViewer/LEDA/ in FindLEDA.cmake 2008-12-16 17:50:57 +00:00
Fernando Cacciola c5b9fb843f Allow blank in paths to sources 2008-12-14 23:38:01 +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 760dd350eb Set WITH_LEDA OFF by defaut 2008-12-05 16:21:14 +00:00
Laurent Rineau 38cbc3926c If GMP is not here, CGAL_Core cannot be compiled. 2008-12-03 13:57:18 +00:00
Laurent Rineau 642bde884e Last minute big change: make GMP/MPFR an optional dependency.
Locally tested.

Just after that commit, I will create a fake release and trigger a
test suite with that modification.
2008-12-03 13:09:43 +00:00
Fernando Cacciola 4bf387c6ca Fix assembling of optimized|debug LEDA libraries 2008-12-02 18:31:31 +00:00
Fernando Cacciola dfa94e2e7d Patch FindQt4 moccing under windows 2008-11-28 21:18:33 +00:00
Fernando Cacciola 4a4d927522 Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
Fernando Cacciola 2d5b17b9f4 renamed cmake/modules to lib/CGAL-3.4 (0/1) 2008-11-04 16:00:57 +00:00
Fernando Cacciola fb446def12 Moved CGALConfig.cmake-.*.in down lib/CGAL.3,4 2008-11-04 15:58:45 +00:00
Laurent Saboret c99c1ce981 Fixed usage of LAPACK_LINKER_FLAGS (see r46659) 2008-11-04 14:37:39 +00:00
Laurent Saboret 69eade49a7 Port to Windows/Visual C++ 2005 2008-11-04 14:15:30 +00:00
Fernando Cacciola 3843318804 Fixed usage of BLAS_LINKER_FLAGS 2008-11-04 13:48:23 +00:00
Fernando Cacciola 808720ead6 FIxed LEDA_LINERFLAGS and use them in CGAL_SetupLEDA 2008-11-04 13:47:59 +00:00
Fernando Cacciola d597b8c40b Separate defintions from flags 2008-11-04 13:25:05 +00:00
Fernando Cacciola 994028ec51 Prefixed CreateSingleSourceCGALProgram.cmake with CGAL_ 2008-11-04 13:09:48 +00:00
Fernando Cacciola 29000b40d1 Removed more obsoloted cmake modules 2008-11-04 12:56:36 +00:00