From: Matthias Maier Date: Tue, 23 Jul 2013 09:24:00 +0000 (+0000) Subject: Take over r30122 - r30124 from trunk X-Git-Tag: v8.0.0~8 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d67a2af8740dbd714e58025402cbe2bae49a50a;p=dealii.git Take over r30122 - r30124 from trunk git-svn-id: https://svn.dealii.org/branches/releases/Branch-8-0@30126 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/macros/macro_enable_language_optional.cmake b/deal.II/cmake/macros/macro_enable_language_optional.cmake index 975f476059..885b960f8c 100644 --- a/deal.II/cmake/macros/macro_enable_language_optional.cmake +++ b/deal.II/cmake/macros/macro_enable_language_optional.cmake @@ -48,8 +48,9 @@ MACRO(ENABLE_LANGUAGE_OPTIONAL _language) FILE(WRITE ${_tmp}/CMakeLists.txt "PROJECT(foobar ${_language})" ) + EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} ${_hint} . + COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${_hint} . WORKING_DIRECTORY ${_tmp} RESULT_VARIABLE _result OUTPUT_QUIET diff --git a/deal.II/cmake/setup_compiler_flags_gnu.cmake b/deal.II/cmake/setup_compiler_flags_gnu.cmake index 45d88b1975..1c64fcd104 100644 --- a/deal.II/cmake/setup_compiler_flags_gnu.cmake +++ b/deal.II/cmake/setup_compiler_flags_gnu.cmake @@ -81,6 +81,11 @@ ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-deprecated-declarations") IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + # + # Silence Clang warnings about unused parameters: + # + SET(CMAKE_CXX_FLAGS "-Qunused-arguments ${CMAKE_CXX_FLAGS}") + # # *Boy*, clang seems to be the very definition of "pedantic" in # "-pedantic" mode, so disable a bunch of harmless warnings @@ -120,7 +125,9 @@ IF (CMAKE_BUILD_TYPE MATCHES "Release") ADD_FLAGS(DEAL_II_CXX_FLAGS_RELEASE "-O2") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-funroll-loops") - ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-funroll-all-loops") + IF(NOT(CMAKE_CXX_COMPILER_ID MATCHES "Clang")) + ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-funroll-all-loops") + ENDIF() ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-fstrict-aliasing") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-felide-constructors") diff --git a/deal.II/source/dofs/dof_tools.inst.in b/deal.II/source/dofs/dof_tools.inst.in index d5d3b5dba2..17d1beaa6c 100644 --- a/deal.II/source/dofs/dof_tools.inst.in +++ b/deal.II/source/dofs/dof_tools.inst.in @@ -296,11 +296,11 @@ for (SP : SPARSITY_PATTERNS; deal_II_dimension : DIMENSIONS) const std::vector &, SP &); - //template void - //DoFTools::make_boundary_sparsity_pattern,SP> - //(const hp::DoFHandler<1,3>& dof, - // const std::vector &, - // SP &); + template void + DoFTools::make_boundary_sparsity_pattern,SP> + (const hp::DoFHandler<1,3>& dof, + const std::vector &, + SP &); template void DoFTools::make_boundary_sparsity_pattern,SP> @@ -309,12 +309,12 @@ for (SP : SPARSITY_PATTERNS; deal_II_dimension : DIMENSIONS) const std::vector &dof_to_boundary_mapping, SP &sparsity); - //template void - //DoFTools::make_boundary_sparsity_pattern,SP> - //(const hp::DoFHandler<1,3>& dof, - // const FunctionMap<3>::type &boundary_indicators, - // const std::vector &dof_to_boundary_mapping, - // SP &sparsity); + template void + DoFTools::make_boundary_sparsity_pattern,SP> + (const hp::DoFHandler<1,3>& dof, + const FunctionMap<3>::type &boundary_indicators, + const std::vector &dof_to_boundary_mapping, + SP &sparsity); #endif @@ -1179,18 +1179,18 @@ DoFTools::extract_hanging_node_dofs (const DoFHandler<1,3> &dof_handler, std::vector &selected_dofs); -// template -// void -// DoFTools::map_dof_to_boundary_indices > -// (const hp::DoFHandler<1,3> &, -// const std::set &, -// std::vector &); - -// template -// void -// DoFTools::map_dof_to_boundary_indices > -// (const hp::DoFHandler<1,3> &, -// std::vector &); +template +void +DoFTools::map_dof_to_boundary_indices > +(const hp::DoFHandler<1,3> &, + const std::set &, + std::vector &); + +template +void +DoFTools::map_dof_to_boundary_indices > +(const hp::DoFHandler<1,3> &, + std::vector &); #endif