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

move detection whether additional LEDA flags are necessary to FindLEDA stage 

only apply includes if UseLEDA is called
This commit is contained in:
Alexander Kobel 2012-10-04 13:28:51 +00:00
parent d3d82afd4a
commit 461a23478d
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Installation/cmake/modules/CGAL_UseLEDA.cmake
View File

@ -22,21 +22,14 @@ if ( LEDA_FOUND AND NOT LEDA_SETUP )
link_libraries( ${LEDA_LIBRARIES} )
endif()
if ( CMAKE_COMPILER_IS_GNUCXX )
get_dependency_version (GCC)
if ( NOT "${GCC_VERSION}" VERSION_LESS "4.1" )
message( STATUS "Using LEDA with gcc version 4.1 or later. Adding -ffriend-injection" )
uniquely_add_flags (CMAKE_CXX_FLAGS "-ffriend-injection")
endif()
if ( NOT "${GCC_VERSION}" VERSION_LESS "4.4" )
message( STATUS "Using LEDA with gcc version 4.4 or later. Adding -fno-strict-aliasing" )
uniquely_add_flags (CMAKE_CXX_FLAGS "-fno-strict-aliasing")
endif()
if ( UNIX )
message( STATUS "Using LEDA with gcc on *nix. Adding -lX11" )
uniquely_add_flags( CMAKE_SHARED_LINKER_FLAGS "-lX11" )
uniquely_add_flags( CMAKE_MODULE_LINKER_FLAGS "-lX11" )
endif()
if (LEDA_CGAL_FRIEND_INJECTION)
message( STATUS "${LEDA_CGAL_FRIEND_INJECTION}" )
endif()
if (LEDA_CGAL_NO_STRICT_ALIASING)
message( STATUS "${LEDA_CGAL_NO_STRICT_ALIASING}" )
endif()
if (LEDA_CGAL_LINK_X11)
message( STATUS "${LEDA_CGAL_LINK_X11}" )
endif()
uniquely_add_flags( CMAKE_CXX_FLAGS ${LEDA_CXX_FLAGS} )

20
Installation/cmake/modules/FindLEDA.cmake
View File

@ -89,6 +89,26 @@ endif()
if ( LEDA_INCLUDE_DIR AND LEDA_LIBRARIES)
set(LEDA_FOUND TRUE)
if ( CMAKE_COMPILER_IS_GNUCXX )
get_dependency_version (GCC)
if ( NOT "${GCC_VERSION}" VERSION_LESS "4.1" )
set(LEDA_CGAL_FRIEND_INJECTION TRUE)
typed_cache_set( STRING "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" )
set(LEDA_CGAL_NO_STRICT_ALIASING TRUE)
typed_cache_set( STRING "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")
uniquely_add_flags (LEDA_CXX_FLAGS "-fno-strict-aliasing")
endif()
if ( UNIX )
set(LEDA_CGAL_LINK_X11 TRUE)
typed_cache_set( STRING "Link against X11 on *nix" LEDA_CGAL_LINK_X11 "Using LEDA with gcc on *nix: Adding -lX11")
uniquely_add_flags( LEDA_LINKER_FLAGS "-lX11" )
endif()
endif()
set(LEDA_USE_FILE "CGAL_UseLEDA")
endif()