From f6e83cd23e976bdd620083fd2da2adbbc8d2be54 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 13 Dec 2018 10:59:00 +0100 Subject: [PATCH] Move the definition of CGAL_USE_FILE in case of early return() --- Installation/lib/cmake/CGAL/CGALConfig.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake index ad0de1806ca..0fa343ba78c 100644 --- a/Installation/lib/cmake/CGAL/CGALConfig.cmake +++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake @@ -73,6 +73,9 @@ include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake) include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake) include(${CGAL_MODULES_DIR}/CGAL_Common.cmake) +set(CGAL_USE_FILE ${CGAL_MODULES_DIR}/UseCGAL.cmake) + + if(CGAL_BUILDING_LIBS) foreach(comp ${CGAL_FIND_COMPONENTS}) if(CGAL_${comp}_FOUND) @@ -146,8 +149,6 @@ endforeach() # Temporary? Change the CMAKE module path cgal_setup_module_path() -set(CGAL_USE_FILE ${CGAL_MODULES_DIR}/UseCGAL.cmake) - include("${CGAL_MODULES_DIR}/CGAL_parse_version_h.cmake") cgal_parse_version_h( "${CGAL_INSTALLATION_PACKAGE_DIR}/include/CGAL/version.h" "CGAL_VERSION_NAME"