From 0e6302d1d5d9ed36722bae8ed2ccf6aa30d432df Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 2 Jul 2020 15:02:20 +0200 Subject: [PATCH] Remove CGAL_REFERENCE_CACHE_DIR That no longer works with header-only, anyway. Now we use the option `-C` of CMake, with a small file loaded from the environment variable `INIT_FILE`. --- Installation/CMakeLists.txt | 37 ------------------------- Scripts/developer_scripts/autotest_cgal | 15 +--------- 2 files changed, 1 insertion(+), 51 deletions(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 42dfeb8190a..3556338d667 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -382,8 +382,6 @@ include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake) include(${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake) cgal_setup_module_path() -message( STATUS "CGAL_REFERENCE_CACHE_DIR=${CGAL_REFERENCE_CACHE_DIR}" ) - if ( RUNNING_CGAL_AUTO_TEST ) message(STATUS "Operating system:") execute_process(COMMAND uname -a @@ -392,41 +390,6 @@ if ( RUNNING_CGAL_AUTO_TEST ) ERROR_VARIABLE uname_a) message(STATUS "${uname_a}") CGAL_display_compiler_version() - if ( NOT "${CGAL_REFERENCE_CACHE_DIR}" STREQUAL "" ) - if ( EXISTS ${CGAL_REFERENCE_CACHE_DIR} ) - if ( EXISTS ${CGAL_REFERENCE_CACHE_DIR}/CMakeCache.txt ) - message( STATUS "Loading reference cache from ${CGAL_REFERENCE_CACHE_DIR}" ) - load_cache( ${CGAL_REFERENCE_CACHE_DIR} - EXCLUDE CGAL_Core_LIBRARY - CGAL_CORE_PACKAGE_DIR - WITH_CGAL_Core - CGAL_INSTALLATION_PACKAGE_DIR - CGAL_MAINTENANCE_PACKAGE_DIR - CGAL_PDB_BINARY_DIR - CGAL_PDB_SOURCE_DIR - CGAL_BINARY_DIR - CGAL_SOURCE_DIR) -# message("List of cache variables:") - - ## The following lines removes nasty loaded cache values. We do not - ## want that the current build tree depends on binaries that were - ## build in the reference build tree. - get_property(cache_variables DIRECTORY PROPERTY CACHE_VARIABLES) - foreach(var ${cache_variables}) -# get_property(var_value CACHE ${var} PROPERTY VALUE) -# get_property(type CACHE ${var} PROPERTY TYPE) - string(REGEX MATCH "^CGAL(_.*_(DEPENDS|BINARY_DIR)|_.*LIBRARY)$" var_name_matches ${var}) - if(var_name_matches) - unset(${var} CACHE) -# else() -# message("${var}:${var_type}=${var_value}") - endif() - endforeach() - - - endif() - endif() - endif() endif() include(CGAL_Common) diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal index 0cae40110f4..558256bc1b5 100755 --- a/Scripts/developer_scripts/autotest_cgal +++ b/Scripts/developer_scripts/autotest_cgal @@ -490,13 +490,7 @@ build_cgal_on_host() CGAL_BINARY_DIR="${CGAL_BINARY_DIR_BASE}/${PLATFORM}" - if [ -d "${REFERENCE_PLATFORMS_DIR}/${PLATFORM}" ] ; then - CGAL_REFERENCE_CACHE_DIR="${REFERENCE_PLATFORMS_DIR}/${PLATFORM}" - else - CGAL_REFERENCE_CACHE_DIR="" - fi - - log "${ACTUAL_LOGFILE}" "Building cgal libs on host ${HOST} and platform ${PLATFORM}\nUnder ${CGAL_BINARY_DIR}\nUsing reference cache directory ${CGAL_REFERENCE_CACHE_DIR}" + log "${ACTUAL_LOGFILE}" "Building cgal libs on host ${HOST} and platform ${PLATFORM}\nUnder ${CGAL_BINARY_DIR}\n" if [ -f "${CGAL_BINARY_DIR}/localbuildscript" ] ; then log "${ACTUAL_LOGFILE}" "WARNING! Already built on platform ${PLATFORM}." @@ -514,19 +508,12 @@ if [ -z "\$CMAKE_GENERATOR" ]; then CMAKE_GENERATOR='${CMAKE_GENERATOR}'; fi MAKE_CMD='${MAKE_CMD}'; -if [ -n "${IS_CYGWIN}" ]; then - CGAL_REFERENCE_CACHE_DIR=\$( cygpath -w '${CGAL_REFERENCE_CACHE_DIR}' ); -else - CGAL_REFERENCE_CACHE_DIR='${CGAL_REFERENCE_CACHE_DIR}';\ -fi export CMAKE_GENERATOR; export MAKE_CMD; export CGAL_BINARY_DIR; -export CGAL_REFERENCE_CACHE_DIR; cd '${CGAL_BINARY_DIR}'; cmake \${INIT_FILE:+"-C\${INIT_FILE}"} '${CMAKE_GENERATOR}' -DRUNNING_CGAL_AUTO_TEST=TRUE \\ - -DCGAL_REFERENCE_CACHE_DIR="\$CGAL_REFERENCE_CACHE_DIR" \\ VERBOSE=1 \\ ../../..; ${MAKE_CMD} VERBOSE=ON -k -fMakefile ;