From 804c16b678219e0db6e2426f526c505aeca2de76 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 4 Jun 2014 17:49:28 +0000 Subject: [PATCH] CMake: Just filter libclang_rt* git-svn-id: https://svn.dealii.org/trunk@33016 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_filter_system_libraries.cmake | 2 +- deal.II/cmake/modules/FindPETSC.cmake | 4 ++-- deal.II/doc/news/changes.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deal.II/cmake/macros/macro_filter_system_libraries.cmake b/deal.II/cmake/macros/macro_filter_system_libraries.cmake index 35a015cd2d..293edb030b 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|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 10de64d81b..fc0bb477d5 100644 --- 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 0df68bcad0..84a45349c6 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -148,7 +148,7 @@ inconvenience this causes.

Specific improvements

    -
  1. Bugfix: Also treat libclang_rt and libclang_rt.osx as system libraries. +
  2. Bugfix: Filter libclang_rt* from the PETSc link line.
    (Matthias Maier, 2014/06/04)
  3. -- 2.39.5