From 1c7474c629593219c6f6e8550df4804cc071662d Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 21 Aug 2014 19:14:20 +0200 Subject: [PATCH] CMake: Remove non-functional code This actually never worked... --- CMakeLists.txt | 1 - cmake/setup_sanity_checks.cmake | 72 --------------------------------- doc/news/changes.h | 6 --- 3 files changed, 79 deletions(-) delete mode 100644 cmake/setup_sanity_checks.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index e9b4e3a5ee..72bf5f2b03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,7 +125,6 @@ ENDFOREACH() INCLUDE(setup_custom_targets) INCLUDE(setup_finalize) INCLUDE(setup_write_config) -#INCLUDE(setup_sanity_checks) ######################################################################## diff --git a/cmake/setup_sanity_checks.cmake b/cmake/setup_sanity_checks.cmake deleted file mode 100644 index f8091b7507..0000000000 --- a/cmake/setup_sanity_checks.cmake +++ /dev/null @@ -1,72 +0,0 @@ -## --------------------------------------------------------------------- -## $Id$ -## -## Copyright (C) 2014 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- - - -######################################################################## -# # -# Sanity checks: # -# # -######################################################################## - -# -# A quick test whether we're able to successfully link with the given -# compiler and linker flags and the given library link interface: -# - -MESSAGE(STATUS "") -MESSAGE(STATUS "Sanity checks.") - -FOREACH(_build ${DEAL_II_BUILD_TYPES}) - - FOREACH(_var - CXX_FLAGS CXX_FLAGS_${_build} - LINKER_FLAGS LINKER_FLAGS_${_build} - LIBRARIES LIBRARIES_${_build} - ) - IF(NOT "${DEAL_II_${_var}}" STREQUAL "${CACHED_DEAL_II_${_var}_${_build}}") - UNSET(DEAL_II_SANITY_CHECK_${_build} CACHE) - SET(CACHED_DEAL_II_${_var}_${_build} "${DEAL_II_${_var}}" CACHE INTERNAL "" FORCE) - ENDIF() - ENDFOREACH() - - RESET_CMAKE_REQUIRED() - ADD_FLAGS(CMAKE_REQUIRED_FLAGS - "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" - ) - LIST(APPEND CMAKE_REQUIRED_LIBRARIES - "${DEAL_II_LINKER_FLAGS} ${DEAL_II_CXX_LINKER_${_build}}" - ) - LIST(APPEND CMAKE_REQUIRED_LIBRARIES - ${DEAL_II_LIBRARIES} - ${DEAL_II_LIBRARIES_${_build}} - ) - CHECK_CXX_SOURCE_COMPILES("int main(){ return 0; }" - DEAL_II_SANITY_CHECK_${_build} - ) - RESET_CMAKE_REQUIRED() - - IF(NOT DEAL_II_SANITY_CHECK_${_build}) - UNSET(DEAL_II_SANITY_CHECK_${_build} CACHE) - MESSAGE(FATAL_ERROR " - Configuration error: Cannot compile and link with the current set of - compiler flags, linker flags and libraries! - - Please check the test output given at the end of - CMakeFiles/CMakeError.log and consult detailed.log for the current - configuration.\n\n" - ) - ENDIF() -ENDFOREACH() diff --git a/doc/news/changes.h b/doc/news/changes.h index aca712d743..a132eace3a 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -749,12 +749,6 @@ inconvenience this causes.
(Martin Kronbichler, 2014/02/03) -
  • Added: A sanity check for the full link interface at configure time. - Hopefully this prevents some people from compiling the whole library just - to hit a link error. -
    - (Matthias Maier, 2014/02/01) -
  • Fixed: The build system does no longer record full paths to system libraries but uses the appropriate short names instead.
    -- 2.39.5