mirror of https://github.com/CGAL/cgal
Try to use LEDA without -ffriend-injection
This commit is contained in:
parent
21d53cd984
commit
263a5715f2
|
|
@ -21,9 +21,6 @@ if ( LEDA_FOUND AND NOT LEDA_SETUP )
|
||||||
link_libraries( ${LEDA_LIBRARIES} )
|
link_libraries( ${LEDA_LIBRARIES} )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (LEDA_CGAL_FRIEND_INJECTION)
|
|
||||||
message( STATUS "${LEDA_CGAL_FRIEND_INJECTION}" )
|
|
||||||
endif()
|
|
||||||
if (LEDA_CGAL_NO_STRICT_ALIASING)
|
if (LEDA_CGAL_NO_STRICT_ALIASING)
|
||||||
message( STATUS "${LEDA_CGAL_NO_STRICT_ALIASING}" )
|
message( STATUS "${LEDA_CGAL_NO_STRICT_ALIASING}" )
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -92,11 +92,6 @@ if ( LEDA_INCLUDE_DIR AND LEDA_LIBRARIES)
|
||||||
|
|
||||||
if ( CMAKE_COMPILER_IS_GNUCXX )
|
if ( CMAKE_COMPILER_IS_GNUCXX )
|
||||||
get_dependency_version (GCC)
|
get_dependency_version (GCC)
|
||||||
if ( NOT "${GCC_VERSION}" VERSION_LESS "4.1" )
|
|
||||||
set(LEDA_CGAL_FRIEND_INJECTION TRUE)
|
|
||||||
typed_cache_set( INTERNAL "Add -ffriend-injection on gcc >= 4.1" LEDA_CGAL_FRIEND_INJECTION "Using LEDA with gcc version 4.1 or later: Adding -ffriend-injection")
|
|
||||||
uniquely_add_flags (LEDA_CXX_FLAGS "-ffriend-injection")
|
|
||||||
endif()
|
|
||||||
if ( NOT "${GCC_VERSION}" VERSION_LESS "4.4" )
|
if ( NOT "${GCC_VERSION}" VERSION_LESS "4.4" )
|
||||||
set(LEDA_CGAL_NO_STRICT_ALIASING TRUE)
|
set(LEDA_CGAL_NO_STRICT_ALIASING TRUE)
|
||||||
typed_cache_set( INTERNAL "Add -fno-strict-aliasing on gcc >= 4.4" LEDA_CGAL_NO_STRICT_ALIASING "Using LEDA with gcc version 4.4 or later: Adding -fno-strict-aliasing")
|
typed_cache_set( INTERNAL "Add -fno-strict-aliasing on gcc >= 4.4" LEDA_CGAL_NO_STRICT_ALIASING "Using LEDA with gcc version 4.4 or later: Adding -fno-strict-aliasing")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue