From 9da5aabae48eee16aec4e890fe90a930a34151dc Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 18 Sep 2012 21:52:56 +0000 Subject: [PATCH] last changes for today. git-svn-id: https://svn.dealii.org/branches/branch_cmake@26489 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/contrib/cmake/configure/configure_boost.cmake | 10 +--------- .../cmake/configure/configure_functionparser.cmake | 2 +- deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake | 10 ++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/deal.II/contrib/cmake/configure/configure_boost.cmake b/deal.II/contrib/cmake/configure/configure_boost.cmake index 2f0b29c80c..0db427acef 100644 --- a/deal.II/contrib/cmake/configure/configure_boost.cmake +++ b/deal.II/contrib/cmake/configure/configure_boost.cmake @@ -61,18 +61,10 @@ MACRO(FEATURE_BOOST_CONFIGURE_CONTRIB var) # compile the necessary parts of boost out of ./contrib - # We need some definitions to use the headers of the bundled boost + # We need to set some definitions to use the headers of the bundled boost # library: ADD_DEFINITIONS("-DBOOST_NO_HASH" "-DBOOST_NO_SLIST") - # - # Newer versions have a flag -Wunused-local-typedefs that, though in principle - # a good idea, triggers a lot in BOOST in various places. Unfortunately, - # this warning is included in -W/-Wall, so disable it if the compiler - # supports it. - # - ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-unused-local-typedefs") - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/contrib/boost-1.49.0/include ) diff --git a/deal.II/contrib/cmake/configure/configure_functionparser.cmake b/deal.II/contrib/cmake/configure/configure_functionparser.cmake index 2aab942e52..4b7bf48748 100644 --- a/deal.II/contrib/cmake/configure/configure_functionparser.cmake +++ b/deal.II/contrib/cmake/configure/configure_functionparser.cmake @@ -1,6 +1,6 @@ MACRO(FEATURE_FUNCTIONPARSER_FIND_EXTERNAL var) MESSAGE(WARNING "\n" - "Module for finding functionparser not written, yet!\n\n" + "No module available for finding functionparser externally.\n\n" ) ENDMACRO() diff --git a/deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake b/deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake index 52ac0ec612..2e36489eaa 100644 --- a/deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake +++ b/deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake @@ -79,6 +79,16 @@ ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS_RELEASE "-fstrict-aliasing") ENABLE_IF_AVAILABLE(CMAKE_C_FLAGS_RELEASE "-felide-constructors") ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS_RELEASE "-felide-constructors") +# +# TODO: Migrate this toggle to the boost objects, if possible. +# Newer versions have a flag -Wunused-local-typedefs that, though in principle +# a good idea, triggers a lot in BOOST in various places. Unfortunately, +# this warning is included in -W/-Wall, so disable it if the compiler +# supports it. +# +ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-unused-local-typedefs") + + ############################### # # -- 2.39.5