CMake: Bugfix: Treat libclang_rt and libclang_rt.osx as system library

git-svn-id: https://svn.dealii.org/trunk@33012 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 49b4e75bf3fa77bfdbce1394f5c236f4aa49fab8..9c73bc95bed9670412f83693cfbdf027f241aafe 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).so$")
+        IF(_lib MATCHES "lib(c|quadmath|gfortran|m|rt|nsl|dl|pthread|clang_rt|clang_rt.osx)\\.(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 4cc4aef5198fbef9b608480816584c888c87bfe5..99edd238d598e7e13652ac7aad249599ada926a1 100644 (file)
--- a/deal.II/cmake/modules/FindPETSC.cmake
+++ b/deal.II/cmake/modules/FindPETSC.cmake
@@ -190,7 +190,7 @@ IF(NOT PETSC_PETSCVARIABLES MATCHES "-NOTFOUND")
 
       LIST(APPEND _cleanup_variables PETSC_LIBRARY_${_token})
 
-      IF(_token MATCHES "^(c|quadmath|gfortran|m|rt|nsl|dl|pthread)$")
+      IF(_token MATCHES "^(c|quadmath|gfortran|m|rt|nsl|dl|pthread|clang_rt|clang_rt.osx)$")
         FIND_SYSTEM_LIBRARY(PETSC_LIBRARY_${_token} NAMES ${_token})
         IF(NOT PETSC_LIBRARY_${_token} MATCHES "-NOTFOUND")
           LIST(APPEND _petsc_libraries ${PETSC_LIBRARY_${_token}})

diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index 93f6835018ad7b62f7bea6ba6f9d18349d82a656..0df68bcad08c0fc1c2b70eb652daa4fdcc0fd52a 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -148,6 +148,11 @@ inconvenience this causes.
 <h3>Specific improvements</h3>
 
 <ol>
+  <li> Bugfix: Also treat libclang_rt and libclang_rt.osx as system libraries.
+  <br>
+  (Matthias Maier, 2014/06/04)
+  </li>
+
   <li> Improved: ParameterHandler parsing added to DoFOutputOperator
   <br>
   (Guido Kanschat, 2014/06/03)