From: Matthias Maier Date: Tue, 16 Jul 2013 11:17:36 +0000 (+0000) Subject: CMake: Somehow resolve the cache invalidation problems. X-Git-Tag: v8.0.0~113 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=157abeb084e0dc71c6ad06bb95910d676c449147;p=dealii.git CMake: Somehow resolve the cache invalidation problems. I have no idea why this is actually working... git-svn-id: https://svn.dealii.org/trunk@30009 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_1_threads.cmake b/deal.II/cmake/configure/configure_1_threads.cmake index 28bcc10bb5..d318cfd970 100644 --- a/deal.II/cmake/configure/configure_1_threads.cmake +++ b/deal.II/cmake/configure/configure_1_threads.cmake @@ -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...) diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_2_petsc.cmake similarity index 95% rename from deal.II/cmake/configure/configure_petsc.cmake rename to deal.II/cmake/configure/configure_2_petsc.cmake index a7d8d6d626..134ec3a2d3 100644 --- a/deal.II/cmake/configure/configure_petsc.cmake +++ b/deal.II/cmake/configure/configure_2_petsc.cmake @@ -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}) diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_2_trilinos.cmake similarity index 96% rename from deal.II/cmake/configure/configure_trilinos.cmake rename to deal.II/cmake/configure/configure_2_trilinos.cmake index 3194dcd1b6..35bdbc3c09 100644 --- a/deal.II/cmake/configure/configure_trilinos.cmake +++ b/deal.II/cmake/configure/configure_2_trilinos.cmake @@ -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...