CMake: Rename "(CMAKE|DEAL_II)_SHARED_" to "DEAL_II_" because these variables are...

git-svn-id: https://svn.dealii.org/trunk@29979 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/checks/check_01_compiler_features.cmake b/deal.II/cmake/checks/check_01_compiler_features.cmake
index 736514b1d623bfc22ec0614bae79171afa339cd8..d5a718fa6a574bd4e884af23904ba4f68e1ee0fe 100644 (file)
--- a/deal.II/cmake/checks/check_01_compiler_features.cmake
+++ b/deal.II/cmake/checks/check_01_compiler_features.cmake
@@ -149,7 +149,7 @@ CHECK_CXX_SOURCE_COMPILES(
   HAVE_GLIBC_STACKTRACE)
 
 IF(HAVE_GLIBC_STACKTRACE AND NOT DEAL_II_STATIC_EXECUTABLE)
-  ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-rdynamic")
+  ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS "-rdynamic")
 ENDIF()
 
 

diff --git a/deal.II/cmake/checks/check_02_system_features.cmake b/deal.II/cmake/checks/check_02_system_features.cmake
index 4288bff50b15bf26782670ace74dea74c7137a73..128c1cc250e48f9edde791c2eceb2b9349e21be8 100644 (file)
--- a/deal.II/cmake/checks/check_02_system_features.cmake
+++ b/deal.II/cmake/checks/check_02_system_features.cmake
@@ -90,7 +90,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   #
   # TODO: MM: Check whether this is still necessary...
   #
-  STRIP_FLAG(CMAKE_SHARED_LINKER_FLAGS "-rdynamic")
+  STRIP_FLAG(DEAL_II_LINKER_FLAGS "-rdynamic")
 ENDIF()
 
 
@@ -122,9 +122,9 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
   # - Matthias Maier, 2012
   #
   STRIP_FLAG(DEAL_II_CXX_FLAGS_DEBUG "-ggdb")
-  STRIP_FLAG(DEAL_II_SHARED_LINKER_FLAGS_DEBUG "-ggdb")
+  STRIP_FLAG(DEAL_II_LINKER_FLAGS_DEBUG "-ggdb")
   STRIP_FLAG(DEAL_II_CXX_FLAGS_DEBUG "-g")
-  STRIP_FLAG(DEAL_II_SHARED_LINKER_FLAGS_DEBUG "-g")
+  STRIP_FLAG(DEAL_II_LINKER_FLAGS_DEBUG "-g")
 ENDIF()
 
 IF(CMAKE_SYSTEM_NAME MATCHES "CYGWIN")

diff --git a/deal.II/cmake/config/CMakeLists.txt b/deal.II/cmake/config/CMakeLists.txt
index 02780e6ed275df03ad692c4c7e14bad16a2d8559..bfb02a436f2f6817a9f6f7274f37fb20b5692ba4 100644 (file)
--- a/deal.II/cmake/config/CMakeLists.txt
+++ b/deal.II/cmake/config/CMakeLists.txt
@@ -214,7 +214,7 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES)
     # Set up our linker flags:
     #
     SET(MAKEFILE_LDFLAGS_${build}
-      "${CMAKE_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${build}} ${CMAKE_SHARED_LINKER_FLAGS} ${DEAL_II_SHARED_LINKER_FLAGS_${build}}"
+      "${CMAKE_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${build}} ${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${build}}"
       )
   ENDFOREACH()
 

diff --git a/deal.II/cmake/config/Config.cmake.in b/deal.II/cmake/config/Config.cmake.in
index 0d33e257abc27ca67f319f527b1b643a6845028e..017b6f251030f135c1d9dfef9c07f55257eede1d 100644 (file)
--- a/deal.II/cmake/config/Config.cmake.in
+++ b/deal.II/cmake/config/Config.cmake.in
@@ -108,13 +108,13 @@ SET(DEAL_II_CXX_FLAGS_DEBUG "@DEAL_II_CXX_FLAGS_DEBUG@")
 SET(DEAL_II_CXX_FLAGS_RELEASE "@DEAL_II_CXX_FLAGS_RELEASE@")
 
 # used for all targets:
-SET(DEAL_II_LINKER_FLAGS "@CMAKE_SHARED_LINKER_FLAGS@")
+SET(DEAL_II_LINKER_FLAGS "@DEAL_II_LINKER_FLAGS@")
 
 # _additionally_ used for debug targets:
-SET(DEAL_II_LINKER_FLAGS_DEBUG "@DEAL_II_SHARED_LINKER_FLAGS_DEBUG@")
+SET(DEAL_II_LINKER_FLAGS_DEBUG "@DEAL_II_LINKER_FLAGS_DEBUG@")
 
 # _additionally_ used for release targets:
-SET(DEAL_II_LINKER_FLAGS_RELEASE "@DEAL_II_SHARED_LINKER_FLAGS_RELEASE@")
+SET(DEAL_II_LINKER_FLAGS_RELEASE "@DEAL_II_LINKER_FLAGS_RELEASE@")
 
 # used for all targets:
 SET(DEAL_II_USER_DEFINITIONS "@DEAL_II_USER_DEFINITIONS@")

diff --git a/deal.II/cmake/configure/configure_1_lapack.cmake b/deal.II/cmake/configure/configure_1_lapack.cmake
index d822253b30f49b4aa178786d0b389595d2212e4e..8a03577ded65755b646d7e92cb5355f1865705e4 100644 (file)
--- a/deal.II/cmake/configure/configure_1_lapack.cmake
+++ b/deal.II/cmake/configure/configure_1_lapack.cmake
@@ -112,7 +112,7 @@ ENDMACRO()
 
 MACRO(FEATURE_LAPACK_CONFIGURE_EXTERNAL)
 
-  ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${LAPACK_LINKER_FLAGS}")
+  ADD_FLAGS(DEAL_II_LINKER_FLAGS "${LAPACK_LINKER_FLAGS}")
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${LAPACK_LIBRARIES})
 
   CHECK_FOR_LAPACK_FUNCTIONS()

diff --git a/deal.II/cmake/configure/configure_1_mpi.cmake b/deal.II/cmake/configure/configure_1_mpi.cmake
index da78dfd05fcc2197766b82ec3a46e5605082d65e..9f8585be2e29cf0e61cf762696babac4fe7f1757 100644 (file)
--- a/deal.II/cmake/configure/configure_1_mpi.cmake
+++ b/deal.II/cmake/configure/configure_1_mpi.cmake
@@ -70,7 +70,7 @@ ENDMACRO()
 
 MACRO(FEATURE_MPI_CONFIGURE_EXTERNAL)
   ADD_FLAGS(CMAKE_CXX_FLAGS "${MPI_CXX_COMPILE_FLAGS}")
-  ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${MPI_CXX_LINK_FLAGS}")
+  ADD_FLAGS(DEAL_II_LINKER_FLAGS "${MPI_CXX_LINK_FLAGS}")
 
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${MPI_CXX_LIBRARIES})
   INCLUDE_DIRECTORIES(${MPI_CXX_INCLUDE_PATH})

diff --git a/deal.II/cmake/configure/configure_1_threads.cmake b/deal.II/cmake/configure/configure_1_threads.cmake
index f2df40515643a7a5861c5e7ee3df288bce70268f..1fa55f435e6d8217f4205f38a7618284eb46dc3c 100644 (file)
--- a/deal.II/cmake/configure/configure_1_threads.cmake
+++ b/deal.II/cmake/configure/configure_1_threads.cmake
@@ -50,7 +50,7 @@ MACRO(SETUP_THREADING)
     ENDIF()
   ENDIF()
 
-  ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_THREAD_LIBS_INIT}")
+  ADD_FLAGS(DEAL_II_LINKER_FLAGS "${CMAKE_THREAD_LIBS_INIT}")
 
   #
   # Set up some posix thread specific configuration toggles:

diff --git a/deal.II/cmake/macros/macro_configure_feature.cmake b/deal.II/cmake/macros/macro_configure_feature.cmake
index 991531e19b03ea7d9d992e39d76a9ff6f259b58c..49e3e46cf3a1638eba634f4791e5f02792b87375 100644 (file)
--- a/deal.II/cmake/macros/macro_configure_feature.cmake
+++ b/deal.II/cmake/macros/macro_configure_feature.cmake
@@ -143,7 +143,7 @@ MACRO(FEATURE_CONFIGURE_EXTERNAL _feature)
     LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${${_feature}_LIBRARIES})
   ENDIF()
   IF(DEFINED ${_feature}_LINKER_FLAGS)
-    ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${${_feature}_LINKER_FLAGS}")
+    ADD_FLAGS(DEAL_II_LINKER_FLAGS "${${_feature}_LINKER_FLAGS}")
   ENDIF()
 ENDMACRO()
 

diff --git a/deal.II/cmake/macros/macro_deal_ii_add_library.cmake b/deal.II/cmake/macros/macro_deal_ii_add_library.cmake
index a86d4dba44759d8c4aee1d0cd102e6cfc127c123..5a0a116f17dceeb93c441f55d45e721663be8f32 100644 (file)
--- a/deal.II/cmake/macros/macro_deal_ii_add_library.cmake
+++ b/deal.II/cmake/macros/macro_deal_ii_add_library.cmake
@@ -17,12 +17,12 @@
 # build type specified in DEAL_II_BUILD_TYPES
 #
 # It is assumed that the desired compilation configuration is set via
-#   DEAL_II_SHARED_LINKER_FLAGS_${build}
+#   DEAL_II_LINKER_FLAGS_${build}
 #   DEAL_II_CXX_FLAGS_${build}
 #   DEAL_II_DEFINITIONS_${build}
 #
 # as well as the global (for all build types)
-#   CMAKE_SHARED_LINKER_FLAGS
+#   DEAL_II_LINKER_FLAGS
 #   CMAKE_CXX_FLAGS
 #   DEAL_II_DEFINITIONS
 #
@@ -37,7 +37,7 @@ MACRO(DEAL_II_ADD_LIBRARY _library)
       )
 
     SET_TARGET_PROPERTIES(${_library}.${_build_lowercase} PROPERTIES
-      LINK_FLAGS "${DEAL_II_SHARED_LINKER_FLAGS_${_build}}"
+      LINK_FLAGS "${DEAL_II_LINKER_FLAGS};${DEAL_II_LINKER_FLAGS_${_build}}"
       COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${_build}}"
       COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_${_build}}"
       LINKER_LANGUAGE "CXX"

diff --git a/deal.II/cmake/scripts/CMakeLists.txt b/deal.II/cmake/scripts/CMakeLists.txt
index 80272980de53d522672a5a29f5f35016ee45923d..41c50b9855b6f16a80be137b5e594ad0e0b12be0 100644 (file)
--- a/deal.II/cmake/scripts/CMakeLists.txt
+++ b/deal.II/cmake/scripts/CMakeLists.txt
@@ -52,7 +52,7 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES)
   TARGET_LINK_LIBRARIES(report_features ${DEAL_II_EXTERNAL_LIBRARIES})
   SET_TARGET_PROPERTIES(report_features
     PROPERTIES
-    LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
+    LINK_FLAGS "${DEAL_II_LINKER_FLAGS}"
     COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS}"
     )
 

diff --git a/deal.II/cmake/setup_cached_variables.cmake b/deal.II/cmake/setup_cached_variables.cmake
index 4e12f4241486f80342d5b97ba3076235ad4e6a9f..0439cf354ab1266b98d21a1548bce06bd6d144cd 100644 (file)
--- a/deal.II/cmake/setup_cached_variables.cmake
+++ b/deal.II/cmake/setup_cached_variables.cmake
@@ -38,11 +38,11 @@
 #     CMAKE_INSTALL_RPATH_USE_LINK_PATH
 #     CMAKE_C_FLAGS                     *)
 #     CMAKE_CXX_FLAGS                   *)
-#     CMAKE_SHARED_LINKER_FLAGS         *)
+#     DEAL_II_LINKER_FLAGS              *)
 #     DEAL_II_CXX_FLAGS_DEBUG
-#     DEAL_II_SHARED_LINKER_FLAGS_DEBUG
+#     DEAL_II_LINKER_FLAGS_DEBUG
 #     DEAL_II_CXX_FLAGS_RELEASE
-#     DEAL_II_SHARED_LINKER_FLAGS_RELEASE
+#     DEAL_II_LINKER_FLAGS_RELEASE
 #     DEAL_II_WITH_64BIT_INDICES
 #
 # *)  May also be set via environment variable (CFLAGS, CXXFLAGS, LDFLAGS)
@@ -219,6 +219,7 @@ FOREACH(_flag
   CMAKE_C_FLAGS_DEBUG
   CMAKE_C_FLAGS_MINSIZEREL
   CMAKE_C_FLAGS_RELWITHDEBINFO
+  CMAKE_SHARED_LINKER_FLAGS
   CMAKE_SHARED_LINKER_FLAGS_DEBUG
   CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
   CMAKE_SHARED_LINKER_FLAGS_RELEASE
@@ -236,9 +237,9 @@ SET(DEAL_II_USED_FLAGS
   CMAKE_CXX_FLAGS
   DEAL_II_CXX_FLAGS_DEBUG
   DEAL_II_CXX_FLAGS_RELEASE
-  CMAKE_SHARED_LINKER_FLAGS
-  DEAL_II_SHARED_LINKER_FLAGS_DEBUG
-  DEAL_II_SHARED_LINKER_FLAGS_RELEASE
+  DEAL_II_LINKER_FLAGS
+  DEAL_II_LINKER_FLAGS_DEBUG
+  DEAL_II_LINKER_FLAGS_RELEASE
   )
 
 FOREACH(_flag ${DEAL_II_USED_FLAGS})
@@ -271,7 +272,7 @@ ENDFOREACH()
 #
 SET(CMAKE_C_FLAGS_SAVED "$ENV{CFLAGS} ${CMAKE_C_FLAGS_SAVED}")
 SET(CMAKE_CXX_FLAGS_SAVED "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_SAVED}")
-SET(CMAKE_SHARED_LINKER_FLAGS_SAVED "$ENV{LDFLAGS} ${CMAKE_SHARED_LINKER_FLAGS_SAVED}")
+SET(DEAL_II_LINKER_FLAGS_SAVED "$ENV{LDFLAGS} ${DEAL_II_LINKER_FLAGS_SAVED}")
 UNSET(ENV{CFLAGS})
 UNSET(ENV{CXXFLAGS})
 UNSET(ENV{LDFLAGS})

diff --git a/deal.II/cmake/setup_compiler_flags.cmake b/deal.II/cmake/setup_compiler_flags.cmake
index db784362b44d4333fec714a7880a4fbf334df0dd..f3df43df99148925309bcef782ce67b90f4a9d5b 100644 (file)
--- a/deal.II/cmake/setup_compiler_flags.cmake
+++ b/deal.II/cmake/setup_compiler_flags.cmake
@@ -28,15 +28,15 @@
 #   CMAKE_CXX_FLAGS
 #   DEAL_II_CXX_FLAGS_DEBUG
 #   DEAL_II_CXX_FLAGS_RELEASE
-#   CMAKE_SHARED_LINKER_FLAGS
-#   DEAL_II_SHARED_LINKER_FLAGS_DEBUG
-#   DEAL_II_SHARED_LINKER_FLAGS_RELEASE
+#   DEAL_II_LINKER_FLAGS
+#   DEAL_II_LINKER_FLAGS_DEBUG
+#   DEAL_II_LINKER_FLAGS_RELEASE
 #
 # All modifications shall be guarded with the ENABLE_IF_SUPPORTED
 # or ENABLE_IF_LINKS macro, e.g.
 #
 #   ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-fpic")
-#   ENABLE_IF_LINKS(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
+#   ENABLE_IF_LINKS(DEAL_II_LINKER_FLAGS "-Wl,--as-needed")
 #
 # Checks for compiler features (such as C++11 support) and compiler
 # specific bugs that

diff --git a/deal.II/cmake/setup_compiler_flags_gnu.cmake b/deal.II/cmake/setup_compiler_flags_gnu.cmake
index 1f6135460ee521e73997ca962f972d96e3dcfd3c..de5f551dd701b4f9c554c163c13cf1358184d0b4 100644 (file)
--- a/deal.II/cmake/setup_compiler_flags_gnu.cmake
+++ b/deal.II/cmake/setup_compiler_flags_gnu.cmake
@@ -51,7 +51,7 @@ ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-fpic")
 # Check whether the -as-needed flag is available. If so set it to link
 # the deal.II library with it.
 #
-ENABLE_IF_LINKS(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
+ENABLE_IF_LINKS(DEAL_II_LINKER_FLAGS "-Wl,--as-needed")
 
 #
 # Setup various warnings:
@@ -100,10 +100,10 @@ IF(DEAL_II_STATIC_EXECUTABLE)
   # To produce a static executable, we have to statically link libstdc++
   # and gcc's support libraries and glibc:
   #
-  # (Well... the name "CMAKE_SHARED_LINKER_FLAGS" is a bit misleading :-])
+  # (Well... the name "DEAL_II_LINKER_FLAGS" is a bit misleading :-])
   #
-  ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-static")
-  ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-pthread")
+  ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS "-static")
+  ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS "-pthread")
 ENDIF()
 
 
@@ -147,13 +147,13 @@ IF (CMAKE_BUILD_TYPE MATCHES "Debug")
   ENDIF()
 
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_DEBUG "-ggdb")
-  ENABLE_IF_SUPPORTED(DEAL_II_SHARED_LINKER_FLAGS_DEBUG "-ggdb")
+  ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS_DEBUG "-ggdb")
   #
   # If -ggdb is not available, fall back to -g:
   #
   IF(NOT DEAL_II_HAVE_FLAG_ggdb)
     ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_DEBUG "-g")
-    ENABLE_IF_SUPPORTED(DEAL_II_SHARED_LINKER_FLAGS_DEBUG "-g")
+    ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS_DEBUG "-g")
   ENDIF()
 ENDIF()
 

diff --git a/deal.II/cmake/setup_compiler_flags_intel.cmake b/deal.II/cmake/setup_compiler_flags_intel.cmake
index 1c82c3ef5cfa0ec09b11733d1a871ac88e4dbbe7..677e5174f4bb95bc261d78cabae28f56fa99291a 100644 (file)
--- a/deal.II/cmake/setup_compiler_flags_intel.cmake
+++ b/deal.II/cmake/setup_compiler_flags_intel.cmake
@@ -42,7 +42,7 @@ ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-fpic")
 # Check whether the -as-needed flag is available. If so set it to link
 # the deal.II library with it.
 #
-ENABLE_IF_LINKS(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
+ENABLE_IF_LINKS(DEAL_II_LINKER_FLAGS "-Wl,--as-needed")
 
 #
 # Set ansi mode:

diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake
index fbf44de46634d5b497cf90acf78ca0d8b5008978..3d93833240988a095e3e4cd274d12d8ebff1de05 100644 (file)
--- a/deal.II/cmake/setup_finalize.cmake
+++ b/deal.II/cmake/setup_finalize.cmake
@@ -99,30 +99,36 @@ _both(
   )
 IF(CMAKE_CROSSCOMPILING)
   _both(
-    "#        CROSSCOMPILING!\n"
+    "#\n#        CROSSCOMPILING!\n"
     "#        DEAL_II_NATIVE:         ${DEAL_II_NATIVE}\n"
     )
 ENDIF()
 
+IF(DEAL_II_STATIC_EXECUTABLE)
+  _both(
+    "#\n#        STATIC LINKAGE!\n"
+    )
+ENDIF()
+
 _both("#\n")
 
 _detailed(
 "#  Compiler flags used for this build:
-#        CMAKE_CXX_FLAGS:                     ${CMAKE_CXX_FLAGS}
+#        CMAKE_CXX_FLAGS:              ${CMAKE_CXX_FLAGS}
 "
   )
 IF(CMAKE_BUILD_TYPE MATCHES "Release")
-  _detailed("#        DEAL_II_CXX_FLAGS_RELEASE:           ${DEAL_II_CXX_FLAGS_RELEASE}\n")
+  _detailed("#        DEAL_II_CXX_FLAGS_RELEASE:    ${DEAL_II_CXX_FLAGS_RELEASE}\n")
 ENDIF()
 IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-  _detailed("#        DEAL_II_CXX_FLAGS_DEBUG:             ${DEAL_II_CXX_FLAGS_DEBUG}\n")
+  _detailed("#        DEAL_II_CXX_FLAGS_DEBUG:      ${DEAL_II_CXX_FLAGS_DEBUG}\n")
 ENDIF()
-_detailed("#        CMAKE_SHARED_LINKER_FLAGS:           ${CMAKE_SHARED_LINKER_FLAGS}\n")
+_detailed("#        DEAL_II_LINKER_FLAGS:         ${DEAL_II_LINKER_FLAGS}\n")
 IF(CMAKE_BUILD_TYPE MATCHES "Release")
-  _detailed("#        DEAL_II_SHARED_LINKER_FLAGS_RELEASE: ${DEAL_II_SHARED_LINKER_FLAGS_RELEASE}\n")
+  _detailed("#        DEAL_II_LINKER_FLAGS_RELEASE: ${DEAL_II_LINKER_FLAGS_RELEASE}\n")
 ENDIF()
 IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-  _detailed("#        DEAL_II_SHARED_LINKER_FLAGS_DEBUG:   ${DEAL_II_SHARED_LINKER_FLAGS_DEBUG}\n")
+  _detailed("#        DEAL_II_LINKER_FLAGS_DEBUG:   ${DEAL_II_LINKER_FLAGS_DEBUG}\n")
 ENDIF()
 _detailed("#\n")
 

diff --git a/deal.II/doc/development/Config.sample b/deal.II/doc/development/Config.sample
index db9285adfee089b57cc3f27e2b30d62413ed65af..07ce4312b1c1c3db46eb25873ff7471db2d61446 100644 (file)
--- a/deal.II/doc/development/Config.sample
+++ b/deal.II/doc/development/Config.sample
@@ -95,16 +95,16 @@
 #   "The user supplied cache variable will be appended _at the end_ of the auto generated DEAL_II_CXX_FLAGS_RELEASE variable"
 #   )
 #
-# SET(CMAKE_SHARED_LINKER_FLAGS "" CACHE STRING
-#   "The user supplied cache variable will be appended _at the end_ of the auto generated CMAKE_SHARED_LINKER_FLAGS variable"
+# SET(DEAL_II_LINKER_FLAGS "" CACHE STRING
+#   "The user supplied cache variable will be appended _at the end_ of the auto generated DEAL_II_LINKER_FLAGS variable"
 #   )
 #
-# SET(DEAL_II_SHARED_LINKER_FLAGS_DEBUG "" CACHE STRING
-#   "The user supplied cache variable will be appended _at the end_ of the auto generated DEAL_II_SHARED_LINKER_FLAGS_DEBUG variable"
+# SET(DEAL_II_LINKER_FLAGS_DEBUG "" CACHE STRING
+#   "The user supplied cache variable will be appended _at the end_ of the auto generated DEAL_II_LINKER_FLAGS_DEBUG variable"
 #   )
 #
-# SET(DEAL_II_SHARED_LINKER_FLAGS_RELEASE "" CACHE STRING
-#   "The user supplied cache variable will be appended _at the end_ of the auto generated DEAL_II_SHARED_LINKER_FLAGS_RELEASE variable"
+# SET(DEAL_II_LINKER_FLAGS_RELEASE "" CACHE STRING
+#   "The user supplied cache variable will be appended _at the end_ of the auto generated DEAL_II_LINKER_FLAGS_RELEASE variable"
 #   )
 #
 # OPTION(DEAL_II_STATIC_EXECUTABLE "ON" CACHE BOOL

diff --git a/deal.II/doc/development/cmake-internals.html b/deal.II/doc/development/cmake-internals.html
index a21b8f0b797cc0085add9df11260bead5acefdca..fd31c2e488a2fcc4daabfb96470457036f4e7fb8 100644 (file)
--- a/deal.II/doc/development/cmake-internals.html
+++ b/deal.II/doc/development/cmake-internals.html
@@ -110,7 +110,7 @@
       PROPERTIES
       VERSION ${VERSION}
       SOVERSION ${VERSION}
-      LINK_FLAGS "${DEAL_II_SHARED_LINKER_FLAGS_${build}}"
+      LINK_FLAGS "${DEAL_II_LINKER_FLAGS_${build}}"
       COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${build}}"
       COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_${build}}"
       )
@@ -177,15 +177,15 @@
     #   CMAKE_CXX_FLAGS
     #   DEAL_II_CXX_FLAGS_DEBUG
     #   DEAL_II_CXX_FLAGS_RELEASE
-    #   CMAKE_SHARED_LINKER_FLAGS
-    #   DEAL_II_SHARED_LINKER_FLAGS_DEBUG
-    #   DEAL_II_SHARED_LINKER_FLAGS_RELEASE
+    #   DEAL_II_LINKER_FLAGS
+    #   DEAL_II_LINKER_FLAGS_DEBUG
+    #   DEAL_II_LINKER_FLAGS_RELEASE
     #
     # All modifications shall be guarded with the ENABLE_IF_SUPPORTED
     # or ENABLE_IF_LINKS macro, e.g.
     #
     #   ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-fpic")
-    #   ENABLE_IF_LINKS(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
+    #   ENABLE_IF_LINKS(DEAL_II_LINKER_FLAGS "-Wl,--as-needed")
     #
     # Compiler flags for platform dependent optimization (such as
     # -march=native) must always be guarded with
@@ -513,9 +513,9 @@
        <li>
          For internal use, for setting necessary linker flags for the deal.II library:
          <ul>
-            <li> <code>CMAKE_SHARED_LINKER_FLAGS</code>
-            <li> <code>DEAL_II_SHARED_LINKER_FLAGS_DEBUG</code>
-            <li> <code>DEAL_II_SHARED_LINKER_FLAGS_RELEASE</code>
+            <li> <code>DEAL_II_LINKER_FLAGS</code>
+            <li> <code>DEAL_II_LINKER_FLAGS_DEBUG</code>
+            <li> <code>DEAL_II_LINKER_FLAGS_RELEASE</code>
          </ul>
 
        <li>