]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Rename the macro to ENABLE_IF_SUPPORTED
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Sep 2012 09:56:11 +0000 (09:56 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Sep 2012 09:56:11 +0000 (09:56 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26494 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/check/check_for_compiler_bugs.cmake
deal.II/contrib/cmake/check/check_for_compiler_features.cmake
deal.II/contrib/cmake/configure/configure_trilinos.cmake
deal.II/contrib/cmake/macros/macro_enable_if_supported.cmake [moved from deal.II/contrib/cmake/macros/macro_enable_if_available.cmake with 80% similarity]
deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake
deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt

index e623a095d3dedc1232443c027f44c7c03a737a2d..ee3511f7e5ef1ad995ad7a2191ed3fe761e93574 100644 (file)
@@ -101,8 +101,8 @@ CHECK_CXX_COMPILER_BUG(
 LIST(REMOVE_ITEM CMAKE_REQUIRED_FLAGS "-Wreturn-type -Werror")
 
 IF(DEAL_II_WRETURN_TYPE_CONST_QUALIFIER_BUG)
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS -Wno-return-type)
-  ENABLE_IF_AVAILABLE(CMAKE_C_FLAGS -Wno-return-type)
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS -Wno-return-type)
+  ENABLE_IF_SUPPORTED(CMAKE_C_FLAGS -Wno-return-type)
 ENDIF()
 
 
@@ -147,8 +147,8 @@ IF(HAVE_MPI_H)
   LIST(REMOVE_ITEM CMAKE_REQUIRED_FLAGS "-Wunused-parameter -Werror")
 
   IF(DEAL_II_ADVANCE_WARNING_BUG)
-    ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-unused-parameter")
-    ENABLE_IF_AVAILABLE(CMAKE_C_FLAGS "-Wno-unused-parameter")
+    ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-unused-parameter")
+    ENABLE_IF_SUPPORTED(CMAKE_C_FLAGS "-Wno-unused-parameter")
   ENDIF()
 ENDIF()
 
index b8e8c1b2735bc97affee6a5d3dd7cd3cd298a0f6..ed1ad8b8861712bfcdfe6c51c85fc95af7ebceb4 100644 (file)
@@ -400,5 +400,5 @@ ENDIF()
 # per email by John Fowkes on the mailing list in Feb 2012,
 # so don't run the test on cygwin.
 #
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS_DEBUG "-Wa,--compress-debug-sections")
-ENABLE_IF_AVAILABLE(CMAKE_C_FLAGS_DEBUG "-Wa,--compress-debug-sections")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_DEBUG "-Wa,--compress-debug-sections")
+ENABLE_IF_SUPPORTED(CMAKE_C_FLAGS_DEBUG "-Wa,--compress-debug-sections")
index 999f7d59b6c3d338262fe8fe4f789f35bc02f01c..e4679d3d2cc12ab585c171f52c50801746900e5d 100644 (file)
@@ -159,9 +159,9 @@ MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL var)
   #  to see through the clutter.
   #
 
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-unused")
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-extra")
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-overloaded-virtual")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-unused")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-extra")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-overloaded-virtual")
 
   SET(${var} TRUE)
 
similarity index 80%
rename from deal.II/contrib/cmake/macros/macro_enable_if_available.cmake
rename to deal.II/contrib/cmake/macros/macro_enable_if_supported.cmake
index b4e444a536094611189f09b6435905bbdc82596f..04753df5fb43c417b77e91a8db822154bf0c6035 100644 (file)
@@ -1,4 +1,4 @@
-MACRO(ENABLE_IF_AVAILABLE variable flag)
+MACRO(ENABLE_IF_SUPPORTED variable flag)
   CHECK_CXX_COMPILER_FLAG(
     "${flag}"
     DEAL_II_HAVE_FLAG_${flag})
index a655d0df730684d667312ed7d287493eb258eaed..e64207c71586fef8e1d253f4ee84e98866a719a3 100644 (file)
 # TODO: On some systems, -fpic/PIC is implied, so don't set anything to
 # avoid a warning.
 #
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-fpic")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-fpic")
 
 #
 # Check whether the -as-needed flag is available. If so set it to link
 # the deal.II library with it.
 #
-ENABLE_IF_AVAILABLE(CMAKE_SHARED_LINKER_FLAGS "-Wl,-as-needed")
+ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-Wl,-as-needed")
 
 
 #
 # Set -pedantic if the compiler supports it.
 #
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-pedantic")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-pedantic")
 
 #
 # Setup various warnings:
 #
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wall")
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wpointer-arith")
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wwrite-strings")
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wsynth")
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wsign-compare")
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wswitch")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wall")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wpointer-arith")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wwrite-strings")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wsynth")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wsign-compare")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wswitch")
 
 
 #
@@ -48,7 +48,7 @@ ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wswitch")
 # 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")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-unused-local-typedefs")
 
 
 IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -61,13 +61,13 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   # be worked around and that are definitely not useful. Suppress
   # those too.
   #
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-array-bounds")
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-parentheses")
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-delete-non-virtual-dtor")
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-unneeded-internal-declaration")
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-unused-function")
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-unused-variable")
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-long-long")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-array-bounds")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-parentheses")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-delete-non-virtual-dtor")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-unneeded-internal-declaration")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-unused-function")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-unused-variable")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-long-long")
 ENDIF()
 
 
@@ -77,7 +77,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   # warnings. However, newer gccs on that platform do not have
   # this flag any more, so check whether we can indeed do this
   #
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS "-Wno-long-double")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-long-double")
 ENDIF()
 
 
@@ -93,7 +93,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") # TODO: Check for correct name
   # you accidentally defined one symbol multiple times...
   # (added 2005/07/13, Ralf B. Schulz)
   # (modified 2005/12/20, Ralf B. Schulz)
-  ENABLE_IF_AVAILABLE(CMAKE_SHARED_LINKER_FLAGS
+  ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS
     "-Xlinker --allow-multiple-definition")
 ENDIF()
 
@@ -110,9 +110,9 @@ ENDIF()
 #
 ADD_FLAGS(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS_RELEASE "-funroll-loops")
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS_RELEASE "-fstrict-aliasing")
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS_RELEASE "-felide-constructors")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-funroll-loops")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-fstrict-aliasing")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-felide-constructors")
 
 
 
@@ -128,13 +128,13 @@ ENDIF()
 
 ADD_FLAGS(CMAKE_CXX_FLAGS_DEBUG "-O0")
 
-ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
-ENABLE_IF_AVAILABLE(CMAKE_SHARED_LINKER_FLAGS "-ggdb")
+ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
+ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-ggdb")
 #
 # If -ggdb is not available, fall back to -g:
 #
 IF(NOT DEAL_II_HAVE_FLAG_-ggdb)
-  ENABLE_IF_AVAILABLE(CMAKE_CXX_FLAGS_DEBUG "-g")
-  ENABLE_IF_AVAILABLE(CMAKE_SHARED_LINKER_FLAGS "-g")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_DEBUG "-g")
+  ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-g")
 ENDIF()
 
index 5aeb1c1f72e8fbf735e3ece2404d4c4604b242fc..2463583a3e726c0ec564354a8de05658765bcc16 100644 (file)
@@ -72,8 +72,8 @@ ENDIF()
 #
 # We have to disable a bunch of warnings:
 #
-ENABLE_IF_AVAILABLE(obj_tbb_COMPILE_FLAGS "-Wno-parentheses")
-ENABLE_IF_AVAILABLE(obj_tbb_COMPILE_FLAGS "-Wno-long-long")
+ENABLE_IF_SUPPORTED(obj_tbb_COMPILE_FLAGS "-Wno-parentheses")
+ENABLE_IF_SUPPORTED(obj_tbb_COMPILE_FLAGS "-Wno-long-long")
 
 
 SET_TARGET_PROPERTIES(obj_tbb PROPERTIES

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.