CMake: remove DEAL_II_PREFER_STATIC_LINKAGE

diff --git a/cmake/setup_cached_variables.cmake b/cmake/setup_cached_variables.cmake
index e3c2a551215d39a74ea4ff80705ff7406cba89d7..18837becc2069b68ce1d1411d4114cacd840d758 100644 (file)
--- a/cmake/setup_cached_variables.cmake
+++ b/cmake/setup_cached_variables.cmake
@@ -36,7 +36,6 @@
 #     DEAL_II_UNITY_BUILD
 #     DEAL_II_EARLY_DEPRECATIONS
 #     BUILD_SHARED_LIBS
-#     DEAL_II_PREFER_STATIC_LIBS
 #     CMAKE_INSTALL_RPATH_USE_LINK_PATH
 #     DEAL_II_CXX_FLAGS                    *)
 #     DEAL_II_CXX_FLAGS_DEBUG
@@ -171,12 +170,6 @@ set(BUILD_SHARED_LIBS "ON" CACHE BOOL
   "Build a shared library"
   )
 
-option(DEAL_II_PREFER_STATIC_LIBS
-  "Prefer static libraries over dynamic libraries when searching for features and corresponding link interface"
-  OFF
-  )
-mark_as_advanced(DEAL_II_PREFER_STATIC_LIBS)
-
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE BOOL
   "Set the rpath of the library to the external link paths on installation"
   )

diff --git a/cmake/setup_deal_ii.cmake b/cmake/setup_deal_ii.cmake
index 58d32fb75666303de2ee6c6f7265b43f2c780e21..e7d3f295dc3e97992d1454b4e0f529887511441b 100644 (file)
--- a/cmake/setup_deal_ii.cmake
+++ b/cmake/setup_deal_ii.cmake
@@ -148,24 +148,10 @@ set(DEAL_II_STRING_SUFFIXES
   LINKER_FLAGS_RELEASE LINKER_FLAGS_DEBUG
   )
 
-
-########################################################################
-#                                                                      #
-#              Setup static linkage and crosscompilation:              #
-#                                                                      #
-########################################################################
-
-if(DEAL_II_PREFER_STATIC_LIBS)
-  #
-  # Invert the search order for libraries when DEAL_II_PREFER_STATIC_LIBS
-  # is set. This will prefer static archives instead of shared libraries:
-  #
-  list(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-endif()
+#
+# Disable platform introspection when cross compiling
+#
 
 if(CMAKE_CROSSCOMPILING)
-  #
-  # Disable platform introspection when cross compiling
-  #
   set(DEAL_II_ALLOW_PLATFORM_INTROSPECTION OFF CACHE BOOL "" FORCE)
 endif()

diff --git a/doc/users/cmake_dealii.html b/doc/users/cmake_dealii.html
index 96f9181342cd5e242d227a30130aa0857bec8aee..7f801cc76ff866640eaa903b219b1add1ddfc688 100644 (file)
--- a/doc/users/cmake_dealii.html
+++ b/doc/users/cmake_dealii.html
@@ -786,11 +786,6 @@ cmake -DLAPACK_FOUND=true \
           <code>BUILD_SHARED_LIBS</code>: If set (default),
           <acronym>deal.II</acronym> will be linked as a shared library
 
-        <li>
-          <code>DEAL_II_PREFER_STATIC_LIBS</code> (defaults to off): If set
-          to true, static archives will be preferred over dynamic libraries when
-          searching for features and corresponding link interface.
-
         <li>
           <code>CMAKE_INSTALL_RPATH_USE_LINK_PATH</code>: If set
           (default), the <acronym>deal.II</acronym> library will be

diff --git a/doc/users/config.sample b/doc/users/config.sample
index 42cf98fca608beec3c309c5623ad0229922b531d..c735d9588824ddc49ee8852a08b5b4419d828717 100644 (file)
--- a/doc/users/config.sample
+++ b/doc/users/config.sample
@@ -52,7 +52,6 @@
 # set(DEAL_II_UNITY_BUILD OFF CACHE BOOL "")
 # set(DEAL_II_EARLY_DEPRECATIONS OFF CACHE BOOL "")
 # set(BUILD_SHARED_LIBS "ON" CACHE BOOL "")
-# set(DEAL_II_PREFER_STATIC_LIBS "OFF" CACHE BOOL "")
 # set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE BOOL "")
 
 #