Laurent Rineau
6e1b0d9e98
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r53794 | spion | 2010-01-26 11:02:56 +0100 (Tue, 26 Jan 2010) | 6 lines
Undo revision 53764, since it triggered problems in the Surface_mesher test-suite
(probably a bug there, but it's a bit late to investigate before 3.6-beta) :
Improve locate() reproducibility. (backport of trunk's revision 53763).
........
r53805 | spion | 2010-01-26 17:09:59 +0100 (Tue, 26 Jan 2010) | 9 lines
Backport trunk revisions 53799 and 53804 :
Make locate() deterministic using Boost RNGs.
The previous approach using a local CGAL::Random failed because it still uses a
global state through drand48()...
Replace CGAL::Random by Boost RNG (with geometric distribution)
in the hierarchy as well, to avoid global state sharing issues.
........
r53807 | penarand | 2010-01-26 19:32:31 +0100 (Tue, 26 Jan 2010) | 3 lines
set RS compilation flag in Mac OS when using g++<4.3
........
r53812 | penarand | 2010-01-27 09:32:13 +0100 (Wed, 27 Jan 2010) | 3 lines
removed extra ';' from _test_polynomial_traits_d.h
........
r53818 | lrineau | 2010-01-27 14:43:08 +0100 (Wed, 27 Jan 2010) | 8 lines
Merge from trunk:
| ------------------------------------------------------------------------
| r53811 | afabri | 2010-01-27 09:20:18 +0100 (Wed, 27 Jan 2010) | 1 line
|
| Switch from CGAL::Random to boost::rand48 as T3 did so
| ------------------------------------------------------------------------
........
47 lines
1.6 KiB
CMake
47 lines
1.6 KiB
CMake
# This module setups the compiler for the RS library.
|
|
# It assumes that find_package(RS) was already called.
|
|
|
|
if( NOT CGAL_RS_SETUP )
|
|
|
|
if( RS_FOUND )
|
|
|
|
message( STATUS "RS include: ${RS_INCLUDE_DIR}" )
|
|
message( STATUS "RS definitions: ${RS_DEFINITIONS}" )
|
|
message( STATUS "RS libraries: ${RS_LIBRARIES}" )
|
|
|
|
if( APPLE AND CMAKE_COMPILER_IS_GNUCXX )
|
|
include( CGAL_VersionUtils )
|
|
EXEC_PROGRAM( ${CMAKE_CXX_COMPILER}
|
|
ARGS -dumpversion
|
|
OUTPUT_VARIABLE RS_GXX_VERSION )
|
|
VERSION_DECOMPOSE( ${RS_GXX_VERSION} GXX_MAJ GXX_MIN GXX_PAT GXX_TWE )
|
|
IS_VERSION_LESS( "${GXX_MAJ}.${GXX_MIN}" "4.3" IS_OLD_GXX )
|
|
if( IS_OLD_GXX )
|
|
message( STATUS "TLS is not supported by g++<4.3 on Mac OS X" )
|
|
add_definitions( "-DCGAL_RS_NO_TLS" )
|
|
endif( IS_OLD_GXX )
|
|
endif( APPLE AND CMAKE_COMPILER_IS_GNUCXX )
|
|
|
|
include_directories ( ${RS_INCLUDE_DIR} )
|
|
add_definitions( ${RS_DEFINITIONS} "-DCGAL_USE_RS" )
|
|
link_libraries( ${RS_LIBRARIES} )
|
|
|
|
# add rs3 parameters, if necessary (rs3 must be always after rsexport)
|
|
if( RS3_FOUND )
|
|
|
|
message( STATUS "RS3 include: ${RS3_INCLUDE_DIR}" )
|
|
message( STATUS "RS3 definitions: ${RS3_DEFINITIONS}" )
|
|
message( STATUS "RS3 libraries: ${RS3_LIBRARIES}" )
|
|
|
|
include_directories ( ${RS3_INCLUDE_DIR} )
|
|
add_definitions( ${RS_DEFINITIONS} "-DCGAL_USE_RS3" )
|
|
link_libraries( ${RS3_LIBRARIES} )
|
|
|
|
endif( RS3_FOUND )
|
|
|
|
endif( RS_FOUND )
|
|
|
|
set( CGAL_RS_SETUP TRUE )
|
|
|
|
endif( NOT CGAL_RS_SETUP )
|