]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
last changes for today.
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 18 Sep 2012 21:52:56 +0000 (21:52 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 18 Sep 2012 21:52:56 +0000 (21:52 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26489 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/configure/configure_boost.cmake
deal.II/contrib/cmake/configure/configure_functionparser.cmake
deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake

index 2f0b29c80c0d29434623a7ae247480c05815d9e9..0db427acef781dbcbd3c096c9f06ea3994a78a05 100644 (file)
@@ -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
     )
index 2aab942e522bd06a52c6801fce6e85874d4f661a..4b7bf48748a53ccd28b0c11d46a7406e6e807565 100644 (file)
@@ -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()
 
index 52ac0ec61253a123f029d20c27375a411afaed11..2e36489eaa5e592e2f4c17dddf349f496af5f5e9 100644 (file)
@@ -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")
+
+
 
 ###############################
 #                             #

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.