CMake: Just filter libclang_rt*

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

diff --git a/deal.II/cmake/macros/macro_filter_system_libraries.cmake b/deal.II/cmake/macros/macro_filter_system_libraries.cmake
index 35a015cd2d737ba0a95cb02fad808e2c8222a525..293edb030b204e90e9145bcf4a6e12ada576a0ef 100644 (file)
--- a/deal.II/cmake/macros/macro_filter_system_libraries.cmake
+++ b/deal.II/cmake/macros/macro_filter_system_libraries.cmake
@@ -33,7 +33,7 @@ MACRO(FILTER_SYSTEM_LIBRARIES _feature)
       SET(_tmp_${_variable} ${${_variable}})
       SET(${_variable} "")
       FOREACH(_lib ${_tmp_${_variable}})
-        IF(_lib MATCHES "lib(c|quadmath|gfortran|m|rt|nsl|dl|pthread|clang_rt.*)\\.(a|so)$")
+        IF(_lib MATCHES "lib(c|quadmath|gfortran|m|rt|nsl|dl|pthread)\\.(a|so)$")
           string(REGEX REPLACE ".*lib([a-z]+).so$" "\\1" _lib ${_lib})
         ENDIF()
         LIST(APPEND ${_variable} ${_lib})

diff --git a/deal.II/cmake/modules/FindPETSC.cmake b/deal.II/cmake/modules/FindPETSC.cmake
index 10de64d81b1c589ab48cc2d86e2977e0a93ac1a9..fc0bb477d5e335d7ce04aca50fa09fce68ba23d7 100644 (file)
--- a/deal.II/cmake/modules/FindPETSC.cmake
+++ b/deal.II/cmake/modules/FindPETSC.cmake
@@ -189,10 +189,10 @@ IF(NOT PETSC_PETSCVARIABLES MATCHES "-NOTFOUND")
       # Search for every library that was specified with -l:
       STRING(REGEX REPLACE "^-l" "" _token "${_token}")
 
-      IF(NOT _token MATCHES "(petsc|stdc\\+\\+|gcc_s)")
+      IF(NOT _token MATCHES "(petsc|stdc\\+\\+|gcc_s|clang_rt)")
         LIST(APPEND _cleanup_variables PETSC_LIBRARY_${_token})
 
-        IF(_token MATCHES "^(c|quadmath|gfortran|m|rt|nsl|dl|pthread|clang_rt.*)$")
+        IF(_token MATCHES "^(c|quadmath|gfortran|m|rt|nsl|dl|pthread)$")
           FIND_SYSTEM_LIBRARY(PETSC_LIBRARY_${_token} NAMES ${_token})
         ELSE()
           DEAL_II_FIND_LIBRARY(PETSC_LIBRARY_${_token}

diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index 0df68bcad08c0fc1c2b70eb652daa4fdcc0fd52a..84a45349c66a90b21f1548451311419283f81443 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -148,7 +148,7 @@ inconvenience this causes.
 <h3>Specific improvements</h3>
 
 <ol>
-  <li> Bugfix: Also treat libclang_rt and libclang_rt.osx as system libraries.
+  <li> Bugfix: Filter libclang_rt* from the PETSc link line.
   <br>
   (Matthias Maier, 2014/06/04)
   </li>