songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 53764-53765,53767,53769 via svnmerge from 

svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53764 | spion | 2010-01-25 13:15:16 +0100 (Mon, 25 Jan 2010) | 2 lines
  
  Improve locate() reproducibility.   (backport of trunk's revision 53763).
........
  r53765 | mcaroli | 2010-01-25 13:33:15 +0100 (Mon, 25 Jan 2010) | 5 lines
  
  Remove iterator range removal: The implementation was inefficient and cannot be made 
  efficient easily because there is a problem with the iterator consistency 
  while computing in 27-sheeted covering: One call to remove removes all
  27 copies of a point which might make the iterator invalid.
........
  r53767 | mcaroli | 2010-01-25 15:08:56 +0100 (Mon, 25 Jan 2010) | 2 lines
  
  cleanup in the preconditions
........
  r53769 | penarand | 2010-01-25 15:35:43 +0100 (Mon, 25 Jan 2010) | 3 lines
  
  moved GMP version check to FindRS.cmake
........
This commit is contained in:
Laurent Rineau 2010-01-25 14:38:53 +00:00
parent 2da81523d1
commit b61a12c43f
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Installation/cmake/modules/FindRS.cmake
View File

@ -1,8 +1,12 @@
# RS needs GMP 4.2 or newer, this script will fail if an old version is
# detected
find_package( MPFI )
if( MPFI_FOUND )
include( ${MPFI_USE_FILE} )
include( CGAL_VersionUtils )
find_path(RS_INCLUDE_DIR
NAMES rs_exports.h
@ -28,28 +32,40 @@ if( MPFI_FOUND )
DOC "Path to the RS3 library"
)
if( RS_INCLUDE_DIR AND RS_LIBRARIES )
set(RS_FOUND TRUE)
endif( RS_INCLUDE_DIR AND RS_LIBRARIES )
IS_VERSION_LESS("${CGAL_GMP_VERSION}" "4.2.0" _IS_GMP_VERSION_TO_LOW)
if( RS3_INCLUDE_DIR AND RS3_LIBRARIES )
set(RS3_FOUND TRUE)
endif( RS3_INCLUDE_DIR AND RS3_LIBRARIES )
if(_IS_GMP_VERSION_TO_LOW)
if( RS_LIBRARIES )
get_filename_component(RS_LIBRARIES_DIR ${RS_LIBRARIES} PATH CACHE )
endif( RS_LIBRARIES )
message( STATUS
"RS needs GMP>=4.2. Your GMP version is ${CGAL_GMP_VERSION}." )
if( NOT RS_INCLUDE_DIR OR NOT RS_LIBRARIES_DIR )
include( RSConfig OPTIONAL )
endif( NOT RS_INCLUDE_DIR OR NOT RS_LIBRARIES_DIR )
else(_IS_GMP_VERSION_TO_LOW)
include(CGAL_FindPackageHandleStandardArgs)
if( RS_INCLUDE_DIR AND RS_LIBRARIES )
set(RS_FOUND TRUE)
endif( RS_INCLUDE_DIR AND RS_LIBRARIES )
if( RS3_INCLUDE_DIR AND RS3_LIBRARIES )
set(RS3_FOUND TRUE)
endif( RS3_INCLUDE_DIR AND RS3_LIBRARIES )
if( RS_LIBRARIES )
get_filename_component(RS_LIBRARIES_DIR ${RS_LIBRARIES} PATH CACHE )
endif( RS_LIBRARIES )
if( NOT RS_INCLUDE_DIR OR NOT RS_LIBRARIES_DIR )
include( RSConfig OPTIONAL )
endif( NOT RS_INCLUDE_DIR OR NOT RS_LIBRARIES_DIR )
include(CGAL_FindPackageHandleStandardArgs)
find_package_handle_standard_args( RS
"DEFAULT_MSG"
RS_LIBRARIES
RS_INCLUDE_DIR )
endif(_IS_GMP_VERSION_TO_LOW)
find_package_handle_standard_args( RS
"DEFAULT_MSG"
RS_LIBRARIES
RS_INCLUDE_DIR )
else( MPFI_FOUND )
message( STATUS "RS requires MPFI" )