mirror of https://github.com/CGAL/cgal
Components checking fixed
This commit is contained in:
Fernando Cacciola
parent
2092077d93
commit
71da81a3bb
|
|
@ -35,8 +35,15 @@ set(CGAL_INCLUDE_DIRS "@CGAL_INCLUDE_DIRS@" )
|
|||
set(CGAL_CMAKE_MODULE_PATH "@CGAL_CMAKE_MODULE_PATH@" )
|
||||
set(CGAL_LIBRARIES_DIR "@CGAL_LIBRARIES_DIR@" )
|
||||
|
||||
set(WITH_CGAL "ON")
|
||||
set(WITH_CGAL_Core "@WITH_CGAL_Core@")
|
||||
set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@")
|
||||
set(WITH_CGAL_PDB "@WITH_CGAL_PDB@" )
|
||||
set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" )
|
||||
set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" )
|
||||
|
||||
set(CGAL_LIBRARY "@CGAL_LIBRARY@")
|
||||
set(CGAL_CORE_LIBRARY "@CGAL_CORE_LIBRARY@")
|
||||
set(CGAL_Core_LIBRARY "@CGAL_Core_LIBRARY@")
|
||||
set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@")
|
||||
set(CGAL_PDB_LIBRARY "@CGAL_PDB_LIBRARY@" )
|
||||
set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" )
|
||||
|
|
@ -47,10 +54,10 @@ set(CGAL_3RD_PARTY_DEFINITIONS "@CGAL_3RD_PARTY_DEFINITIONS@" )
|
|||
set(CGAL_3RD_PARTY_LIBRARIES_DIRS "@CGAL_3RD_PARTY_LIBRARIES_DIRS@" )
|
||||
set(CGAL_3RD_PARTY_LIBRARIES "@CGAL_3RD_PARTY_LIBRARIES@" )
|
||||
|
||||
set(CGAL_CORE_3RD_PARTY_INCLUDE_DIRS "@CGAL_CORE_3RD_PARTY_INCLUDE_DIRS@" )
|
||||
set(CGAL_CORE_3RD_PARTY_DEFINITIONS "@CGAL_CORE_3RD_PARTY_DEFINITIONS@" )
|
||||
set(CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS "@CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS@" )
|
||||
set(CGAL_CORE_3RD_PARTY_LIBRARIES "@CGAL_CORE_3RD_PARTY_LIBRARIES@" )
|
||||
set(CGAL_Core_3RD_PARTY_INCLUDE_DIRS "@CGAL_Core_3RD_PARTY_INCLUDE_DIRS@" )
|
||||
set(CGAL_Core_3RD_PARTY_DEFINITIONS "@CGAL_Core_3RD_PARTY_DEFINITIONS@" )
|
||||
set(CGAL_Core_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Core_3RD_PARTY_LIBRARIES_DIRS@" )
|
||||
set(CGAL_Core_3RD_PARTY_LIBRARIES "@CGAL_Core_3RD_PARTY_LIBRARIES@" )
|
||||
|
||||
set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS "@CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS@" )
|
||||
set(CGAL_ImageIO_3RD_PARTY_DEFINITIONS "@CGAL_ImageIO_3RD_PARTY_DEFINITIONS@" )
|
||||
|
|
@ -92,29 +99,22 @@ endif()
|
|||
|
||||
macro(check_cgal_component COMPONENT)
|
||||
|
||||
if ( NOT "${CGAL${COMPONENT}_LIBRARY}" STREQUAL "" )
|
||||
set( CGAL${COMPONENT}_FOUND TRUE )
|
||||
if ( EXISTS "${CGAL${COMPONENT}_LIBRARY}" )
|
||||
set( CGAL${COMPONENT}_LIBRARY_FOUND TRUE )
|
||||
else()
|
||||
set( CGAL${COMPONENT}_LIBRARY_FOUND FALSE )
|
||||
endif()
|
||||
set( CGAL_LIBRARY CGAL${COMPONENT} )
|
||||
|
||||
if ( WITH_${CGAL_LIBRARY} )
|
||||
set( ${CGAL_LIBRARY}_FOUND TRUE )
|
||||
else()
|
||||
set( CGAL${COMPONENT}_FOUND FALSE )
|
||||
set( ${CGAL_LIBRARY}_FOUND FALSE )
|
||||
endif()
|
||||
|
||||
if ( "${COMPONENT}" STREQUAL "" )
|
||||
set( CHECK_CGAL${COMPONENT}_ERROR_TAIL "" )
|
||||
set( CHECK_${CGAL_LIBRARY}_ERROR_TAIL "" )
|
||||
else()
|
||||
set( CHECK_CGAL${COMPONENT}_ERROR_TAIL " Please configure CGAL using WITH${COMPONENT}=ON." )
|
||||
set( CHECK_${CGAL_LIBRARY}_ERROR_TAIL " Please configure CGAL using WITH_${CGAL_LIBRARY}=ON." )
|
||||
endif()
|
||||
|
||||
if ( NOT CGAL${COMPONENT}_FOUND AND CHECK_CGAL_COMPONENT_MSG_ON_ERROR )
|
||||
message( ${CHECK_CGAL_COMPONENT_ERROR_TYPE} "${CHECK_CGAL_COMPONENT_ERROR_TITLE} The CGAL${COMPONENT} library was not configured.${CHECK_CGAL_COMPONENT_ERROR_TAIL}" )
|
||||
else()
|
||||
if ( NOT CGAL${COMPONENT}_LIBRARY_FOUND AND CHECK_CGAL_COMPONENT_MSG_ON_ERROR )
|
||||
message( ${CHECK_CGAL_COMPONENT_ERROR_TYPE} "${CHECK_CGAL_COMPONENT_ERROR_TITLE} The CGAL${COMPONENT} library was configured but failed to compile." )
|
||||
endif()
|
||||
if ( NOT ${CGAL_LIBRARY}_FOUND AND CHECK_CGAL_COMPONENT_MSG_ON_ERROR )
|
||||
message( ${CHECK_CGAL_COMPONENT_ERROR_TYPE} "${CHECK_CGAL_COMPONENT_ERROR_TITLE} The ${CGAL_LIBRARY} library was not configured.${CHECK_${CGAL_LIBRARY}_ERROR_TAIL}" )
|
||||
endif()
|
||||
|
||||
endmacro()
|
||||
|
|
@ -124,3 +124,4 @@ check_cgal_component("")
|
|||
foreach( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} )
|
||||
check_cgal_component("_${CGAL_COMPONENT}")
|
||||
endforeach()
|
||||
|
||||
|
|
|
|||
|
|
@ -44,8 +44,15 @@ set(CGAL_INCLUDE_DIRS "${CGAL_INSTALL_PREFIX}/@CGAL_INSTALL_INC_DIR@" )
|
|||
set(CGAL_CMAKE_MODULE_PATH "${CGAL_INSTALL_PREFIX}/@CGAL_INSTALL_CMAKE_DIR@" )
|
||||
set(CGAL_LIBRARIES_DIR "${CGAL_INSTALL_PREFIX}/@CGAL_INSTALL_LIB_DIR@" )
|
||||
|
||||
set(WITH_CGAL "ON")
|
||||
set(WITH_CGAL_Core "@WITH_CGAL_Core@")
|
||||
set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@")
|
||||
set(WITH_CGAL_PDB "@WITH_CGAL_PDB@" )
|
||||
set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" )
|
||||
set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" )
|
||||
|
||||
set(CGAL_LIBRARY "@CGAL_LIBRARY@")
|
||||
set(CGAL_CORE_LIBRARY "@CGAL_CORE_LIBRARY@")
|
||||
set(CGAL_Core_LIBRARY "@CGAL_Core_LIBRARY@")
|
||||
set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@")
|
||||
set(CGAL_PDB_LIBRARY "@CGAL_PDB_LIBRARY@" )
|
||||
set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" )
|
||||
|
|
@ -56,10 +63,10 @@ set(CGAL_3RD_PARTY_DEFINITIONS "@CGAL_3RD_PARTY_DEFINITIONS@" )
|
|||
set(CGAL_3RD_PARTY_LIBRARIES_DIRS "@CGAL_3RD_PARTY_LIBRARIES_DIRS@" )
|
||||
set(CGAL_3RD_PARTY_LIBRARIES "@CGAL_3RD_PARTY_LIBRARIES@" )
|
||||
|
||||
set(CGAL_CORE_3RD_PARTY_INCLUDE_DIRS "@CGAL_CORE_3RD_PARTY_INCLUDE_DIRS@" )
|
||||
set(CGAL_CORE_3RD_PARTY_DEFINITIONS "@CGAL_CORE_3RD_PARTY_DEFINITIONS@" )
|
||||
set(CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS "@CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS@" )
|
||||
set(CGAL_CORE_3RD_PARTY_LIBRARIES "@CGAL_CORE_3RD_PARTY_LIBRARIES@" )
|
||||
set(CGAL_Core_3RD_PARTY_INCLUDE_DIRS "@CGAL_Core_3RD_PARTY_INCLUDE_DIRS@" )
|
||||
set(CGAL_Core_3RD_PARTY_DEFINITIONS "@CGAL_Core_3RD_PARTY_DEFINITIONS@" )
|
||||
set(CGAL_Core_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Core_3RD_PARTY_LIBRARIES_DIRS@" )
|
||||
set(CGAL_Core_3RD_PARTY_LIBRARIES "@CGAL_Core_3RD_PARTY_LIBRARIES@" )
|
||||
|
||||
set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS "@CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS@" )
|
||||
set(CGAL_ImageIO_3RD_PARTY_DEFINITIONS "@CGAL_ImageIO_3RD_PARTY_DEFINITIONS@" )
|
||||
|
|
@ -101,29 +108,22 @@ endif()
|
|||
|
||||
macro(check_cgal_component COMPONENT)
|
||||
|
||||
if ( NOT "${CGAL${COMPONENT}_LIBRARY}" STREQUAL "" )
|
||||
set( CGAL${COMPONENT}_FOUND TRUE )
|
||||
if ( EXISTS "${CGAL${COMPONENT}_LIBRARY}" )
|
||||
set( CGAL${COMPONENT}_LIBRARY_FOUND TRUE )
|
||||
else()
|
||||
set( CGAL${COMPONENT}_LIBRARY_FOUND FALSE )
|
||||
endif()
|
||||
set( CGAL_LIBRARY CGAL${COMPONENT} )
|
||||
|
||||
if ( WITH_${CGAL_LIBRARY} )
|
||||
set( ${CGAL_LIBRARY}_FOUND TRUE )
|
||||
else()
|
||||
set( CGAL${COMPONENT}_FOUND FALSE )
|
||||
set( ${CGAL_LIBRARY}_FOUND FALSE )
|
||||
endif()
|
||||
|
||||
if ( "${COMPONENT}" STREQUAL "" )
|
||||
set( CHECK_CGAL${COMPONENT}_ERROR_TAIL "" )
|
||||
set( CHECK_${CGAL_LIBRARY}_ERROR_TAIL "" )
|
||||
else()
|
||||
set( CHECK_CGAL${COMPONENT}_ERROR_TAIL " Please configure CGAL using WITH${COMPONENT}=ON." )
|
||||
set( CHECK_${CGAL_LIBRARY}_ERROR_TAIL " Please configure CGAL using WITH_${CGAL_LIBRARY}=ON." )
|
||||
endif()
|
||||
|
||||
if ( NOT CGAL${COMPONENT}_FOUND AND CHECK_CGAL_COMPONENT_MSG_ON_ERROR )
|
||||
message( ${CHECK_CGAL_COMPONENT_ERROR_TYPE} "${CHECK_CGAL_COMPONENT_ERROR_TITLE} The CGAL${COMPONENT} library was not configured.${CHECK_CGAL_COMPONENT_ERROR_TAIL}" )
|
||||
else()
|
||||
if ( NOT CGAL${COMPONENT}_LIBRARY_FOUND AND CHECK_CGAL_COMPONENT_MSG_ON_ERROR )
|
||||
message( ${CHECK_CGAL_COMPONENT_ERROR_TYPE} "${CHECK_CGAL_COMPONENT_ERROR_TITLE} The CGAL${COMPONENT} library was configured but failed to compile." )
|
||||
endif()
|
||||
if ( NOT ${CGAL_LIBRARY}_FOUND AND CHECK_CGAL_COMPONENT_MSG_ON_ERROR )
|
||||
message( ${CHECK_CGAL_COMPONENT_ERROR_TYPE} "${CHECK_CGAL_COMPONENT_ERROR_TITLE} The ${CGAL_LIBRARY} library was not configured.${CHECK_${CGAL_LIBRARY}_ERROR_TAIL}" )
|
||||
endif()
|
||||
|
||||
endmacro()
|
||||
|
|
@ -133,3 +133,4 @@ check_cgal_component("")
|
|||
foreach( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} )
|
||||
check_cgal_component("_${CGAL_COMPONENT}")
|
||||
endforeach()
|
||||
|
||||
|
|
|
|||
|
|
@ -40,8 +40,15 @@ set(CGAL_INCLUDE_DIRS "$(CGAL_INSTALL_PREFIX)/@CGAL_INSTALL_INC_DIR@" )
|
|||
set(CGAL_CMAKE_MODULE_PATH "$(CGAL_INSTALL_PREFIX)/@CGAL_INSTALL_CMAKE_DIR@" )
|
||||
set(CGAL_LIBRARIES_DIR "$(CGAL_INSTALL_PREFIX)/@CGAL_INSTALL_LIB_DIR@" )
|
||||
|
||||
set(WITH_CGAL "ON")
|
||||
set(WITH_CGAL_Core "@WITH_CGAL_Core@")
|
||||
set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@")
|
||||
set(WITH_CGAL_PDB "@WITH_CGAL_PDB@" )
|
||||
set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" )
|
||||
set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" )
|
||||
|
||||
set(CGAL_LIBRARY "@CGAL_LIBRARY@")
|
||||
set(CGAL_CORE_LIBRARY "@CGAL_CORE_LIBRARY@")
|
||||
set(CGAL_Core_LIBRARY "@CGAL_Core_LIBRARY@")
|
||||
set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@")
|
||||
set(CGAL_PDB_LIBRARY "@CGAL_PDB_LIBRARY@" )
|
||||
set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" )
|
||||
|
|
@ -52,10 +59,10 @@ set(CGAL_3RD_PARTY_DEFINITIONS "@CGAL_3RD_PARTY_DEFINITIONS@" )
|
|||
set(CGAL_3RD_PARTY_LIBRARIES_DIRS "@CGAL_3RD_PARTY_LIBRARIES_DIRS@" )
|
||||
set(CGAL_3RD_PARTY_LIBRARIES "@CGAL_3RD_PARTY_LIBRARIES@" )
|
||||
|
||||
set(CGAL_CORE_3RD_PARTY_INCLUDE_DIRS "@CGAL_CORE_3RD_PARTY_INCLUDE_DIRS@" )
|
||||
set(CGAL_CORE_3RD_PARTY_DEFINITIONS "@CGAL_CORE_3RD_PARTY_DEFINITIONS@" )
|
||||
set(CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS "@CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS@" )
|
||||
set(CGAL_CORE_3RD_PARTY_LIBRARIES "@CGAL_CORE_3RD_PARTY_LIBRARIES@" )
|
||||
set(CGAL_Core_3RD_PARTY_INCLUDE_DIRS "@CGAL_Core_3RD_PARTY_INCLUDE_DIRS@" )
|
||||
set(CGAL_Core_3RD_PARTY_DEFINITIONS "@CGAL_Core_3RD_PARTY_DEFINITIONS@" )
|
||||
set(CGAL_Core_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Core_3RD_PARTY_LIBRARIES_DIRS@" )
|
||||
set(CGAL_Core_3RD_PARTY_LIBRARIES "@CGAL_Core_3RD_PARTY_LIBRARIES@" )
|
||||
|
||||
set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS "@CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS@" )
|
||||
set(CGAL_ImageIO_3RD_PARTY_DEFINITIONS "@CGAL_ImageIO_3RD_PARTY_DEFINITIONS@" )
|
||||
|
|
@ -97,29 +104,22 @@ endif()
|
|||
|
||||
macro(check_cgal_component COMPONENT)
|
||||
|
||||
if ( NOT "${CGAL${COMPONENT}_LIBRARY}" STREQUAL "" )
|
||||
set( CGAL${COMPONENT}_FOUND TRUE )
|
||||
if ( EXISTS "${CGAL${COMPONENT}_LIBRARY}" )
|
||||
set( CGAL${COMPONENT}_LIBRARY_FOUND TRUE )
|
||||
else()
|
||||
set( CGAL${COMPONENT}_LIBRARY_FOUND FALSE )
|
||||
endif()
|
||||
set( CGAL_LIBRARY CGAL${COMPONENT} )
|
||||
|
||||
if ( WITH_${CGAL_LIBRARY} )
|
||||
set( ${CGAL_LIBRARY}_FOUND TRUE )
|
||||
else()
|
||||
set( CGAL${COMPONENT}_FOUND FALSE )
|
||||
set( ${CGAL_LIBRARY}_FOUND FALSE )
|
||||
endif()
|
||||
|
||||
if ( "${COMPONENT}" STREQUAL "" )
|
||||
set( CHECK_CGAL${COMPONENT}_ERROR_TAIL "" )
|
||||
set( CHECK_${CGAL_LIBRARY}_ERROR_TAIL "" )
|
||||
else()
|
||||
set( CHECK_CGAL${COMPONENT}_ERROR_TAIL " Please configure CGAL using WITH${COMPONENT}=ON." )
|
||||
set( CHECK_${CGAL_LIBRARY}_ERROR_TAIL " Please configure CGAL using WITH_${CGAL_LIBRARY}=ON." )
|
||||
endif()
|
||||
|
||||
if ( NOT CGAL${COMPONENT}_FOUND AND CHECK_CGAL_COMPONENT_MSG_ON_ERROR )
|
||||
message( ${CHECK_CGAL_COMPONENT_ERROR_TYPE} "${CHECK_CGAL_COMPONENT_ERROR_TITLE} The CGAL${COMPONENT} library was not configured.${CHECK_CGAL_COMPONENT_ERROR_TAIL}" )
|
||||
else()
|
||||
if ( NOT CGAL${COMPONENT}_LIBRARY_FOUND AND CHECK_CGAL_COMPONENT_MSG_ON_ERROR )
|
||||
message( ${CHECK_CGAL_COMPONENT_ERROR_TYPE} "${CHECK_CGAL_COMPONENT_ERROR_TITLE} The CGAL${COMPONENT} library was configured but failed to compile." )
|
||||
endif()
|
||||
if ( NOT ${CGAL_LIBRARY}_FOUND AND CHECK_CGAL_COMPONENT_MSG_ON_ERROR )
|
||||
message( ${CHECK_CGAL_COMPONENT_ERROR_TYPE} "${CHECK_CGAL_COMPONENT_ERROR_TITLE} The ${CGAL_LIBRARY} library was not configured.${CHECK_${CGAL_LIBRARY}_ERROR_TAIL}" )
|
||||
endif()
|
||||
|
||||
endmacro()
|
||||
|
|
|
|||
Loading…
Reference in New Issue