From 03f4ec85986d662f5c3ffeb2bbca95964fb52f73 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 4 Jun 2014 17:05:55 +0000 Subject: [PATCH] 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 --- deal.II/cmake/macros/macro_filter_system_libraries.cmake | 2 +- deal.II/cmake/modules/FindPETSC.cmake | 2 +- deal.II/doc/news/changes.h | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/deal.II/cmake/macros/macro_filter_system_libraries.cmake b/deal.II/cmake/macros/macro_filter_system_libraries.cmake index 49b4e75bf3..9c73bc95be 100644 --- 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 4cc4aef519..99edd238d5 100644 --- 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 93f6835018..0df68bcad0 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -148,6 +148,11 @@ inconvenience this causes.

Specific improvements

    +
  1. Bugfix: Also treat libclang_rt and libclang_rt.osx as system libraries. +
    + (Matthias Maier, 2014/06/04) +
  2. +
  3. Improved: ParameterHandler parsing added to DoFOutputOperator
    (Guido Kanschat, 2014/06/03) -- 2.39.5