]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Remove non-functional code
authorMatthias Maier <matthias.maier@iwr.uni-heidelberg.de>
Thu, 21 Aug 2014 17:14:20 +0000 (19:14 +0200)
committerMatthias Maier <matthias.maier@iwr.uni-heidelberg.de>
Thu, 21 Aug 2014 17:26:49 +0000 (19:26 +0200)
This actually never worked...

CMakeLists.txt
cmake/setup_sanity_checks.cmake [deleted file]
doc/news/changes.h

index e9b4e3a5eec6df4900084476df764bf8f9f6654b..72bf5f2b0345eaf86cb45d1aa5c3e6946f3703e0 100644 (file)
@@ -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 (file)
index f8091b7..0000000
+++ /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()
index aca712d743f7e2d0c7cf621ea5f90b910ddb85df..a132eace3a3324e8210c8324077131ec36adc278 100644 (file)
@@ -749,12 +749,6 @@ inconvenience this causes.
   <br>
   (Martin Kronbichler, 2014/02/03)
 
-  <li>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.
-  <br>
-  (Matthias Maier, 2014/02/01)
-
   <li>Fixed: The build system does no longer record full paths to system
   libraries but uses the appropriate short names instead.
   <br>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.