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

Revert "This only has to be done in header-only mode" 

This reverts commit ff3b3b01ab96485cd32564175833b68044806bee.
This commit is contained in:
Clement Jamin 2016-09-09 14:07:30 +02:00 committed by Laurent Rineau
parent 6f0efd931f
commit 23a1c3ee54
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Installation/cmake/modules/CGALConfig_binary.cmake.in
View File

@ -133,7 +133,7 @@ macro(check_cgal_component COMPONENT)
if(TARGET CGAL::${CGAL_LIB}) if(TARGET CGAL::${CGAL_LIB})
# In header-only, if CGAL_Qt5 is requested, we need to add the # In header-only, if CGAL_Qt5 is requested, we need to add the
# dependencies here since there is no CGAL_Qt5 lib # dependencies here since there is no CGAL_Qt5 lib
if (CGAL_HEADER_ONLY AND "${CGAL_LIB}" STREQUAL "CGAL_Qt5") if ("${CGAL_LIB}" STREQUAL "CGAL_Qt5")
include("${CGAL_MODULES_DIR}/CGAL_SetupCGAL_Qt5Dependencies.cmake") include("${CGAL_MODULES_DIR}/CGAL_SetupCGAL_Qt5Dependencies.cmake")
@ -142,12 +142,14 @@ macro(check_cgal_component COMPONENT)
message(STATUS "libCGAL_Qt5 is missing the dependencies: ${CGAL_Qt5_MISSING_DEPS} cannot be configured.") message(STATUS "libCGAL_Qt5 is missing the dependencies: ${CGAL_Qt5_MISSING_DEPS} cannot be configured.")
else() else()
set( CGAL_Qt5_FOUND TRUE ) set( CGAL_Qt5_FOUND TRUE )
if (CGAL_HEADER_ONLY)
include("${CGAL_MODULES_DIR}/Use_CGAL_Qt5_headers.cmake") include("${CGAL_MODULES_DIR}/Use_CGAL_Qt5_headers.cmake")
endif() endif()
else(CGAL_HEADER_ONLY AND "${CGAL_LIB}" STREQUAL "CGAL_Qt5") endif()
else("${CGAL_LIB}" STREQUAL "CGAL_Qt5")
# Librairies that have no dependencies # Librairies that have no dependencies
set( ${CGAL_LIB}_FOUND TRUE ) set( ${CGAL_LIB}_FOUND TRUE )
endif(CGAL_HEADER_ONLY AND "${CGAL_LIB}" STREQUAL "CGAL_Qt5") endif("${CGAL_LIB}" STREQUAL "CGAL_Qt5")
else(TARGET CGAL::${CGAL_LIB}) else(TARGET CGAL::${CGAL_LIB})
set( ${CGAL_LIB}_FOUND FALSE ) set( ${CGAL_LIB}_FOUND FALSE )
set( CHECK_${CGAL_LIB}_ERROR_TAIL " CGAL was configured with WITH_${CGAL_LIB}=ON, but one of the dependencies of ${CGAL_LIB} was not configured properly." ) set( CHECK_${CGAL_LIB}_ERROR_TAIL " CGAL was configured with WITH_${CGAL_LIB}=ON, but one of the dependencies of ${CGAL_LIB} was not configured properly." )

8
Installation/cmake/modules/CGALConfig_install.cmake.in
View File

@ -94,7 +94,7 @@ macro(check_cgal_component COMPONENT)
if(TARGET CGAL::${CGAL_LIB}) if(TARGET CGAL::${CGAL_LIB})
# In header-only, if CGAL_Qt5 is requested, we need to add the # In header-only, if CGAL_Qt5 is requested, we need to add the
# dependencies here since there is no CGAL_Qt5 lib # dependencies here since there is no CGAL_Qt5 lib
if (CGAL_HEADER_ONLY AND "${CGAL_LIB}" STREQUAL "CGAL_Qt5") if ("${CGAL_LIB}" STREQUAL "CGAL_Qt5")
include("${CGAL_MODULES_DIR}/CGAL_SetupCGAL_Qt5Dependencies.cmake") include("${CGAL_MODULES_DIR}/CGAL_SetupCGAL_Qt5Dependencies.cmake")
@ -103,12 +103,14 @@ macro(check_cgal_component COMPONENT)
message(STATUS "libCGAL_Qt5 is missing the dependencies: ${CGAL_Qt5_MISSING_DEPS} cannot be configured.") message(STATUS "libCGAL_Qt5 is missing the dependencies: ${CGAL_Qt5_MISSING_DEPS} cannot be configured.")
else() else()
set( CGAL_Qt5_FOUND TRUE ) set( CGAL_Qt5_FOUND TRUE )
if (CGAL_HEADER_ONLY)
include("${CGAL_MODULES_DIR}/Use_CGAL_Qt5_headers.cmake") include("${CGAL_MODULES_DIR}/Use_CGAL_Qt5_headers.cmake")
endif() endif()
else(CGAL_HEADER_ONLY AND "${CGAL_LIB}" STREQUAL "CGAL_Qt5") endif()
else("${CGAL_LIB}" STREQUAL "CGAL_Qt5")
# Librairies that have no dependencies # Librairies that have no dependencies
set( ${CGAL_LIB}_FOUND TRUE ) set( ${CGAL_LIB}_FOUND TRUE )
endif(CGAL_HEADER_ONLY AND "${CGAL_LIB}" STREQUAL "CGAL_Qt5") endif("${CGAL_LIB}" STREQUAL "CGAL_Qt5")
else(TARGET CGAL::${CGAL_LIB}) else(TARGET CGAL::${CGAL_LIB})
set( ${CGAL_LIB}_FOUND FALSE ) set( ${CGAL_LIB}_FOUND FALSE )
set( CHECK_${CGAL_LIB}_ERROR_TAIL " CGAL was configured with WITH_${CGAL_LIB}=ON, but one of the dependencies of ${CGAL_LIB} was not configured properly." ) set( CHECK_${CGAL_LIB}_ERROR_TAIL " CGAL was configured with WITH_${CGAL_LIB}=ON, but one of the dependencies of ${CGAL_LIB} was not configured properly." )