From 23a1c3ee54c5c25494cfeaf09a4411d9d120e837 Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Fri, 9 Sep 2016 14:07:30 +0200 Subject: [PATCH] Revert "This only has to be done in header-only mode" This reverts commit ff3b3b01ab96485cd32564175833b68044806bee. --- Installation/cmake/modules/CGALConfig_binary.cmake.in | 10 ++++++---- Installation/cmake/modules/CGALConfig_install.cmake.in | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Installation/cmake/modules/CGALConfig_binary.cmake.in b/Installation/cmake/modules/CGALConfig_binary.cmake.in index f0c870782b2..1f84bcef671 100644 --- a/Installation/cmake/modules/CGALConfig_binary.cmake.in +++ b/Installation/cmake/modules/CGALConfig_binary.cmake.in @@ -133,7 +133,7 @@ macro(check_cgal_component COMPONENT) if(TARGET CGAL::${CGAL_LIB}) # In header-only, if CGAL_Qt5 is requested, we need to add the # 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") @@ -142,12 +142,14 @@ macro(check_cgal_component COMPONENT) message(STATUS "libCGAL_Qt5 is missing the dependencies: ${CGAL_Qt5_MISSING_DEPS} cannot be configured.") else() set( CGAL_Qt5_FOUND TRUE ) - include("${CGAL_MODULES_DIR}/Use_CGAL_Qt5_headers.cmake") + if (CGAL_HEADER_ONLY) + include("${CGAL_MODULES_DIR}/Use_CGAL_Qt5_headers.cmake") + endif() endif() - else(CGAL_HEADER_ONLY AND "${CGAL_LIB}" STREQUAL "CGAL_Qt5") + else("${CGAL_LIB}" STREQUAL "CGAL_Qt5") # Librairies that have no dependencies 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}) 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." ) diff --git a/Installation/cmake/modules/CGALConfig_install.cmake.in b/Installation/cmake/modules/CGALConfig_install.cmake.in index dce20db8367..910bbdb03e1 100644 --- a/Installation/cmake/modules/CGALConfig_install.cmake.in +++ b/Installation/cmake/modules/CGALConfig_install.cmake.in @@ -94,7 +94,7 @@ macro(check_cgal_component COMPONENT) if(TARGET CGAL::${CGAL_LIB}) # In header-only, if CGAL_Qt5 is requested, we need to add the # 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") @@ -103,12 +103,14 @@ macro(check_cgal_component COMPONENT) message(STATUS "libCGAL_Qt5 is missing the dependencies: ${CGAL_Qt5_MISSING_DEPS} cannot be configured.") else() set( CGAL_Qt5_FOUND TRUE ) - include("${CGAL_MODULES_DIR}/Use_CGAL_Qt5_headers.cmake") + if (CGAL_HEADER_ONLY) + include("${CGAL_MODULES_DIR}/Use_CGAL_Qt5_headers.cmake") + endif() endif() - else(CGAL_HEADER_ONLY AND "${CGAL_LIB}" STREQUAL "CGAL_Qt5") + else("${CGAL_LIB}" STREQUAL "CGAL_Qt5") # Librairies that have no dependencies 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}) 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." )