songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cgal/Installation/cmake/modules
History
Laurent Rineau c965a4d2bb Merged revisions 56724,56795-56798,56808 via svnmerge from 
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56724 | stayeb | 2010-06-14 09:01:34 +0200 (Mon, 14 Jun 2010) | 14 lines
  
  Backport from trunk:
  
    | New Revision: 56647
    | Author: stayeb
    | Date: 2010-06-08 17:28:21 +0200 (Tue, 08 Jun 2010)
    | Log message:
    | Try another workaround for VC++ and Intel compiler (CGAL::centroid). Add a call of overloaded CGAL::centroid function in test-suite.
  
    | New Revision: 56702
    | Author: stayeb
    | Date: 2010-06-11 09:41:10 +0200 (Fri, 11 Jun 2010)
    | Log message:
    | Fix VC++ workaround (tested with MSVS2005)
........
  r56795 | lrineau | 2010-06-16 15:05:02 +0200 (Wed, 16 Jun 2010) | 35 lines
  
  Backport fixes for VC10 from trunk:
    | ------------------------------------------------------------------------
    | r56726 | afabri | 2010-06-14 09:11:59 +0200 (Mon, 14 Jun 2010) | 1 line
    | Changed paths:
    |    M /trunk/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h
    | 
    | For VC-10 we have to change FT* to cpp0x<>::const_iterator
    | ------------------------------------------------------------------------
  
    | ------------------------------------------------------------------------
    | r56758 | lrineau | 2010-06-14 22:29:51 +0200 (Mon, 14 Jun 2010) | 11 lines
    | Changed paths:
    |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
    | 
    | Remove extra typename (broken testsuite) after revision 56725:
    |   | ------------------------------------------------------------------------
    |   | r56725 | afabri | 2010-06-14 09:08:25 +0200 (Mon, 14 Jun 2010) | 1 line
    |   | Changed paths:
    |   |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
    |   |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
    |   |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
    |   | 
    |   | For VC-10 we have to change FT* to cpp0x<>::const_iterator
    |   | ------------------------------------------------------------------------
  
    | ------------------------------------------------------------------------
    | r56725 | afabri | 2010-06-14 09:08:25 +0200 (Mon, 14 Jun 2010) | 1 line
    | Changed paths:
    |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
    |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
    |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
    | 
    | For VC-10 we have to change FT* to cpp0x<>::const_iterator
    | ------------------------------------------------------------------------
........
  r56796 | lrineau | 2010-06-16 15:10:30 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Commit CHANGES for support of VC10.
........
  r56797 | lrineau | 2010-06-16 15:14:49 +0200 (Wed, 16 Jun 2010) | 1 line
  
  Commit mergeinfo stuff.
........
  r56798 | lrineau | 2010-06-16 15:31:05 +0200 (Wed, 16 Jun 2010) | 60 lines
  
  Backport from trunk the changes to the GMP/MPFR support on Windows:
  
    - autolink now depends on CMake options CGAL_AUTO_LINK_GMP and
      CGAL_AUTO_LINK_MPFR (default to ON).
  
    - the environment variables GMP_INC_DIR GMP_LIB_DIR MPFR_INC_DIR
      MPFR_LIB_DIR are used *before* searching into auxilary/gmp/.
  
    - search names for libraries now includes libmpfr-1 and libgmp-10 (names
      of Windows libraries obtained from the compilation of gmp-5.0.1 and
      mpfr-2.4.2).
  
  List of backported commits:
    | ------------------------------------------------------------------------
    | r56751 | lrineau | 2010-06-14 18:47:06 +0200 (Mon, 14 Jun 2010) | 6 lines
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/CGALConfig_binary.cmake.in
    |    M /trunk/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
    |    M /trunk/Installation/cmake/modules/CGAL_SetupGMP.cmake
    |    M /trunk/Installation/cmake/modules/FindGMP.cmake
    |    M /trunk/Installation/cmake/modules/FindMPFR.cmake
    | 
    | Reintegrate the work of /branches/unsorted-branches/Test-no_autolink-for-gmp_mpfr-branch/Installation:
    | 
    | If(MSVC), create CMake variables CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_GMP
    | that can be set to OFF to disable the autolinking for GMP and MPFR. Those
    | variables are stored in the cache, and in CGALConfig.cmake
    | 
    | ------------------------------------------------------------------------
    | r56752 | lrineau | 2010-06-14 18:51:25 +0200 (Mon, 14 Jun 2010) | 1 line
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/CGALConfig_install.cmake.fhs.in
    |    M /trunk/Installation/cmake/modules/CGALConfig_install.cmake.source.in
    | 
    | Patch all CGALConfig*.in the same way.
    | ------------------------------------------------------------------------
    | r56775 | lrineau | 2010-06-15 19:25:37 +0200 (Tue, 15 Jun 2010) | 3 lines
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/FindGMP.cmake
    |    M /trunk/Installation/cmake/modules/FindMPFR.cmake
    | 
    | Fix the library names hints of gmp and mpfr in FindMPFR.cmake and
    | FindGMP.cmake
    | 
    | ------------------------------------------------------------------------
    | r56777 | lrineau | 2010-06-15 20:10:23 +0200 (Tue, 15 Jun 2010) | 2 lines
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/FindGMP.cmake
    | 
    | The env variable must be searched *before* auxiliary/gmp/...
    | 
    | ------------------------------------------------------------------------
    | r56778 | lrineau | 2010-06-15 20:10:56 +0200 (Tue, 15 Jun 2010) | 2 lines
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/FindMPFR.cmake
    | 
    | Search the library also in auxiliary/gmp, even if autolink=OFF.
    | 
    | ------------------------------------------------------------------------
........
  r56808 | lrineau | 2010-06-16 18:10:11 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  Set CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_MPFR defaults to FALSE if MSVC10
  (because GeometryFactory has not generated any autolink-enabled binaries
  of gmp and mpfr for msvc-2010).
........
 		2010-06-16 16:14:51 +00:00
..
CGALConfig_binary.cmake.in Reintegrate the work of /branches/unsorted-branches/Test-no_autolink-for-gmp_mpfr-branch/Installation: 2010-06-14 16:47:06 +00:00
CGALConfig_install.cmake.fhs.in Patch all CGALConfig*.in the same way. 2010-06-14 16:51:25 +00:00
CGALConfig_install.cmake.source.in Patch all CGALConfig*.in the same way. 2010-06-14 16:51:25 +00:00
CGAL_CheckCXXFileRuns.cmake Allow blank in paths to sources 2008-12-14 23:38:01 +00:00
CGAL_Common.cmake Re-removed CMAKE_VERBOSE_MAKEFILE=ON 2009-04-08 14:22:17 +00:00
CGAL_CreateSingleSourceCGALProgram.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
CGAL_CreateSingleSourceCGALProgramQt4.cmake added modified file for qt4 all-source cmake 2009-06-21 13:22:19 +00:00
CGAL_FindPackageHandleStandardArgs.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
CGAL_GeneratorSpecificSettings.cmake Merged revisions 56724,56795-56798,56808 via svnmerge from 2010-06-16 16:14:51 +00:00
CGAL_Locate_CGAL_TAUCS.cmake Bug fix: fixed MKL support in FindBLAS.cmake and FindLAPACK.cmake 2009-10-01 10:36:15 +00:00
CGAL_Macros.cmake Bug fix: fixed MKL support in FindBLAS.cmake and FindLAPACK.cmake 2009-10-01 10:36:15 +00:00
CGAL_SetupBoost.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
CGAL_SetupDependencies.cmake modified cmake scripts so MPFI and RS are not detected and configured at 2009-12-11 11:27:54 +00:00
CGAL_SetupFlags.cmake Fixed loosing flags when configuring demos and examples at once 2009-03-10 18:16:10 +00:00
CGAL_SetupGMP.cmake Reintegrate the work of /branches/unsorted-branches/Test-no_autolink-for-gmp_mpfr-branch/Installation: 2010-06-14 16:47:06 +00:00
CGAL_SetupGMPXX.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
CGAL_SetupLEDA.cmake undone previous changes in CGAL_UseMPFI.cmake and fixed the MPFI/LEDA 2010-04-23 14:17:07 +00:00
CGAL_UseBLAS.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
CGAL_UseLAPACK.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
CGAL_UseMKL.cmake CMake modules to find and link with Intel MKL (including Pardiso) 2009-10-01 10:38:22 +00:00
CGAL_UseMPFI.cmake undone previous changes in CGAL_UseMPFI.cmake and fixed the MPFI/LEDA 2010-04-23 14:17:07 +00:00
CGAL_UseRS.cmake Merged revisions 53794,53805,53807,53812,53818 via svnmerge from 2010-01-27 13:44:08 +00:00
CGAL_UseTAUCS.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
CGAL_VersionUtils.cmake Patch FindBoost.cmake to be compatible with cmake 2.4 2009-03-16 15:47:38 +00:00
FindBLAS.cmake Port to Linux/g++ 4.3.1 2009-10-02 08:22:04 +00:00
FindBoost.cmake Merged revisions 56638,56640 via svnmerge from 2010-06-08 12:59:55 +00:00
FindCGAL.cmake Removed 3.4 suffix 2009-03-11 19:09:25 +00:00
FindCGAL_CORE.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
FindCORE.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
FindESBTL.cmake remove dependance on CGAL_PDB: merge from the branche created for that purpose 2010-06-10 17:26:38 +00:00
FindF2C.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
FindGMP.cmake The env variable must be searched *before* auxiliary/gmp/... 2010-06-15 18:10:23 +00:00
FindGMPXX.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
FindIPE.cmake update cmake script to find ipe7 2009-12-29 19:07:56 +00:00
FindLAPACK.cmake Bug fix: fixed MKL support in FindBLAS.cmake and FindLAPACK.cmake 2009-10-01 10:36:15 +00:00
FindLEDA.cmake Fix a bad copy-paste: s/QGLViewer/LEDA/ in FindLEDA.cmake 2008-12-16 17:50:57 +00:00
FindMKL.cmake Merged revisions 53827-53828,53838,53840-53841 via svnmerge from 2010-01-27 16:43:07 +00:00
FindMPFI.cmake modified cmake scripts so MPFI and RS are not detected and configured at 2009-12-11 11:27:54 +00:00
FindMPFR.cmake Search the library also in auxiliary/gmp, even if autolink=OFF. 2010-06-15 18:10:56 +00:00
FindOpenGL.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
FindPackageMessage.cmake Patch FindQt4 moccing under windows 2008-11-28 21:18:33 +00:00
FindQGLViewer.cmake Merged revisions 53711,53718,53720,53724-53725,53728-53729,53731 via svnmerge from 2010-01-22 15:16:54 +00:00
FindQt3-patched.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
FindQt4.cmake Patch FindQt4 moccing under windows 2008-11-28 21:18:33 +00:00
FindRS.cmake Merged revisions 53764-53765,53767,53769 via svnmerge from 2010-01-25 14:38:53 +00:00
FindTAUCS.cmake Merged revisions 53827-53828,53838,53840-53841 via svnmerge from 2010-01-27 16:43:07 +00:00
Qt3Macros-patched.cmake Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
UseCGAL.cmake Added back the fix for missing flags on demos, examples and tests 2009-04-27 14:32:55 +00:00
UseESBTL.cmake remove dependance on CGAL_PDB: merge from the branche created for that purpose 2010-06-10 17:26:38 +00:00
test_MPFI.cpp - Fix try_run in CGAL_UseMPFI.cmake: move the test file in cmake/modules/. 2010-03-18 10:32:49 +00:00