]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
CMake: Somehow resolve the cache invalidation problems.
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Jul 2013 11:17:36 +0000 (11:17 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Jul 2013 11:17:36 +0000 (11:17 +0000)
I have no idea why this is actually working...

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

deal.II/cmake/configure/configure_1_threads.cmake
deal.II/cmake/configure/configure_2_petsc.cmake [moved from deal.II/cmake/configure/configure_petsc.cmake with 95% similarity]
deal.II/cmake/configure/configure_2_trilinos.cmake [moved from deal.II/cmake/configure/configure_trilinos.cmake with 96% similarity]

index 28bcc10bb511546b6cf4783f8a1efc7af8f6339b..d318cfd9703211308bf086db4d274d81bf0c4062 100644 (file)
@@ -163,15 +163,6 @@ 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...)
similarity index 95%
rename from deal.II/cmake/configure/configure_petsc.cmake
rename to deal.II/cmake/configure/configure_2_petsc.cmake
index a7d8d6d626c578dea52fe25604b7068c89413684..134ec3a2d36f11784a667b16303bbb20599fefd7 100644 (file)
@@ -107,13 +107,6 @@ 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})
 
similarity index 96%
rename from deal.II/cmake/configure/configure_trilinos.cmake
rename to deal.II/cmake/configure/configure_2_trilinos.cmake
index 3194dcd1b61c8c133e1f89c4b31671a904f99d42..35bdbc3c09642672292718a2eb6988ff3eab33c8 100644 (file)
@@ -215,15 +215,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
 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)
   #
   # *Boy* Sanitize the include paths given by TrilinosConfig.cmake...

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.