From 2fbc53d29f7ed15f9687aafceb016f68f21a102f Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 2 Dec 2022 22:14:16 -0600 Subject: [PATCH] CMake: remove DEAL_II_PREFER_STATIC_LINKAGE --- cmake/setup_cached_variables.cmake | 7 ------- cmake/setup_deal_ii.cmake | 20 +++----------------- doc/users/cmake_dealii.html | 5 ----- doc/users/config.sample | 1 - 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/cmake/setup_cached_variables.cmake b/cmake/setup_cached_variables.cmake index e3c2a55121..18837becc2 100644 --- 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 58d32fb756..e7d3f295dc 100644 --- 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 96f9181342..7f801cc76f 100644 --- a/doc/users/cmake_dealii.html +++ b/doc/users/cmake_dealii.html @@ -786,11 +786,6 @@ cmake -DLAPACK_FOUND=true \ BUILD_SHARED_LIBS: If set (default), deal.II will be linked as a shared library -
  • - DEAL_II_PREFER_STATIC_LIBS (defaults to off): If set - to true, static archives will be preferred over dynamic libraries when - searching for features and corresponding link interface. -
  • CMAKE_INSTALL_RPATH_USE_LINK_PATH: If set (default), the deal.II library will be diff --git a/doc/users/config.sample b/doc/users/config.sample index 42cf98fca6..c735d95888 100644 --- 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 "") # -- 2.39.5