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

GMP and MPFR are mandatory

This commit is contained in:
Eric Berberich 2012-06-21 21:57:42 +00:00
parent 5ed099f6c1
commit 00330ee225
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Installation/cmake/modules/CGAL_Macros.cmake
View File

@ -322,12 +322,12 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
if ( NOT CGAL_IGNORE_PRECONFIGURED_${component} AND ${vlib}_FOUND) if ( NOT CGAL_IGNORE_PRECONFIGURED_${component} AND ${vlib}_FOUND)
####message( STATUS "External library ${component} has been preconfigured") message( STATUS "External library ${component} has been preconfigured")
use_lib( ${component} "###${${vlib}_USE_FILE}") use_lib( ${component} "###${${vlib}_USE_FILE}")
else() else()
####message( STATUS "External library ${component} has not been preconfigured") message( STATUS "External library ${component} has not been preconfigured")
find_package( ${component} ) find_package( ${component} )
####message( STATUS "External library ${vlib} after find") ####message( STATUS "External library ${vlib} after find")
if (${vlib}_FOUND) if (${vlib}_FOUND)
@ -386,11 +386,12 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
#write prefix exceptions #write prefix exceptions
file( APPEND ${CMAKE_BINARY_DIR}/CGALConfig.cmake "${SPECIAL_PREFIXES}\n") file( APPEND ${CMAKE_BINARY_DIR}/CGALConfig.cmake "${SPECIAL_PREFIXES}\n")
file( APPEND ${CMAKE_BINARY_DIR}/config/CGALConfig.cmake "${SPECIAL_PREFIXES}") file( APPEND ${CMAKE_BINARY_DIR}/config/CGALConfig.cmake "${SPECIAL_PREFIXES}")
if (CGAL_ENABLE_PRECONFIG)
foreach( lib ${CGAL_SUPPORTING_3RD_PARTY_LIBRARIES} ) foreach( lib ${CGAL_SUPPORTING_3RD_PARTY_LIBRARIES} )
if ( WITH_${lib} ) list( FIND CGAL_MANDATORY_3RD_PARTY_LIBRARIES "${lib}" POSITION )
# if mandatory or preconfiguration for an activated library ...
if ( ("${POSITION}" STRGREATER "-1") OR ( CGAL_ENABLE_PRECONFIG AND WITH_${lib} ))
set (vlib ${CGAL_EXT_LIB_${lib}_PREFIX} ) set (vlib ${CGAL_EXT_LIB_${lib}_PREFIX} )
#the next 'if' is needed to avoid ${vlib} config variables to be overidden in case of a local configuration change #the next 'if' is needed to avoid ${vlib} config variables to be overidden in case of a local configuration change
@ -411,10 +412,9 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
file( APPEND ${CMAKE_BINARY_DIR}/config/CGALConfig.cmake " set( ${vlib}_LIBRARIES \"${${vlib}_LIBRARIES}\" )\n") file( APPEND ${CMAKE_BINARY_DIR}/config/CGALConfig.cmake " set( ${vlib}_LIBRARIES \"${${vlib}_LIBRARIES}\" )\n")
file( APPEND ${CMAKE_BINARY_DIR}/config/CGALConfig.cmake " set( ${vlib}_DEFINITIONS \"${${vlib}_DEFINITIONS}\" )\n") file( APPEND ${CMAKE_BINARY_DIR}/config/CGALConfig.cmake " set( ${vlib}_DEFINITIONS \"${${vlib}_DEFINITIONS}\" )\n")
file( APPEND ${CMAKE_BINARY_DIR}/config/CGALConfig.cmake "endif()\n\n") file( APPEND ${CMAKE_BINARY_DIR}/config/CGALConfig.cmake "endif()\n\n")
endif ( WITH_${lib} ) endif()
endforeach() endforeach()
endif()
endmacro() endmacro()