CMake: Resolve a cache invalidation problem

git-svn-id: https://svn.dealii.org/trunk@29028 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt
index 12fc4d24bcdd582d3b4d1477a6d5fd46f163b1b0..70983ef9f771bd35370f5e57c580db965f87b72e 100644 (file)
--- a/deal.II/bundled/CMakeLists.txt
+++ b/deal.II/bundled/CMakeLists.txt
@@ -98,6 +98,14 @@ OPTION(DEAL_II_FORCE_BUNDLED_UMFPACK
   "Always use the bundled umfpack library instead of an external one."
   OFF)
 
+#
+# Resolve a cache invalidation problem by searching for these flags
+# unconditionally. They're used for compiling the sources in
+# ${UMFPACK_FOLDER}/UMFPACK/Source depending on cached variables.
+#
+ENABLE_IF_SUPPORTED(_dummy "-Wno-sign-compare")
+ENABLE_IF_SUPPORTED(_dummy "-Wno-write-strings")
+
 IF(FEATURE_UMFPACK_BUNDLED_CONFIGURED)
   ADD_SUBDIRECTORY(${UMFPACK_FOLDER}/UMFPACK/Source)
   ADD_SUBDIRECTORY(${UMFPACK_FOLDER}/AMD/Source)

diff --git a/deal.II/cmake/configure/configure_1_threads.cmake b/deal.II/cmake/configure/configure_1_threads.cmake
index 0beb2d1af08fcf6bce09c90609e67b9e371a9cd7..f2df40515643a7a5861c5e7ee3df288bce70268f 100644 (file)
--- a/deal.II/cmake/configure/configure_1_threads.cmake
+++ b/deal.II/cmake/configure/configure_1_threads.cmake
@@ -135,6 +135,15 @@ MACRO(FEATURE_THREADS_CONFIGURE_EXTERNAL)
 ENDMACRO()
 
 
+#
+# Resolve a cache invalidation problem by searching for these flags
+# unconditionally. They're used in FEATURE_THREADS_CONFIGURE_BUNDLED
+# depending on cached variables.
+#
+ENABLE_IF_SUPPORTED(_dummy "-Wno-parentheses")
+ENABLE_IF_SUPPORTED(_dummy "-Wno-long-long")
+
+
 MACRO(FEATURE_THREADS_CONFIGURE_BUNDLED)
   #
   # Setup threading (before configuring our build...)

diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake
index 4a526e7f77498fc0f8436b803a0d972775df3f9e..eaad928c7d7e2e8bd0218ad06dc259362306feb7 100644 (file)
--- a/deal.II/cmake/configure/configure_petsc.cmake
+++ b/deal.II/cmake/configure/configure_petsc.cmake
@@ -80,6 +80,13 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var)
 ENDMACRO()
 
 
+#
+# Resolve a cache invalidation problem by searching for this flag
+# unconditionally. It is used in FEATURE_PETSC_CONFIGURE_EXTERNAL
+# depending on cached variables.
+#
+ENABLE_IF_SUPPORTED(_dummy "-Wno-long-long")
+
 MACRO(FEATURE_PETSC_CONFIGURE_EXTERNAL)
   INCLUDE_DIRECTORIES(${PETSC_INCLUDE_DIRS})
 

diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake
index df202b6d68fefb3c61dd3088609591c17e35fe7b..90b5c2760e736bf9af85a453b1380325a6e523bc 100644 (file)
--- a/deal.II/cmake/configure/configure_trilinos.cmake
+++ b/deal.II/cmake/configure/configure_trilinos.cmake
@@ -168,18 +168,19 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     UNSET(TRILINOS_SUPPORTS_CPP11 CACHE)
     UNSET(TRILINOS_HAS_C99_TR1_WORKAROUND CACHE)
 
-    #
-    # TODO: Resolve this cache invalidation issue and then put these checks
-    # back into FEATURE_TRILINO_CONFIGURE_EXTERNAL where they belong to.
-    #
-    ENABLE_IF_SUPPORTED(TRILINOS_DISABLE_WARNING_FLAGS "-Wno-unused")
-    ENABLE_IF_SUPPORTED(TRILINOS_DISABLE_WARNING_FLAGS "-Wno-extra")
-    ENABLE_IF_SUPPORTED(TRILINOS_DISABLE_WARNING_FLAGS "-Wno-overloaded-virtual")
-
   ENDIF(TRILINOS_FOUND)
 ENDMACRO()
 
 
+#
+# Resolve a cache invalidation problem by searching for these flags
+# unconditionally. They're used in FEATURE_TRILINOS_CONFIGURE_EXTERNAL
+# depending on cached variables.
+#
+ENABLE_IF_SUPPORTED(_dummy "-Wno-unused")
+ENABLE_IF_SUPPORTED(_dummy "-Wno-extra")
+ENABLE_IF_SUPPORTED(_dummy "-Wno-overloaded-virtual")
+
 MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL)
   INCLUDE_DIRECTORIES(${TRILINOS_INCLUDE_DIRS})
 
@@ -205,7 +206,9 @@ MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL)
   #
   # Disable a bunch of warnings caused by Trilinos headers:
   #
-  ADD_FLAGS(CMAKE_CXX_FLAGS "${TRILINOS_DISABLE_WARNING_FLAGS}")
+  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")
 
 ENDMACRO()