From 91bcde7c8a0b0380112c7a27a5e1bc8b1842c611 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 14 Sep 2012 20:25:06 +0000 Subject: [PATCH] Some clarification git-svn-id: https://svn.dealii.org/branches/branch_cmake@26390 0785d39b-7218-0410-832d-ea1e28bc413d --- .../contrib/cmake/macros/macro_check_cxx_compiler_bug.cmake | 2 +- deal.II/contrib/cmake/macros/macro_configure_feature.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deal.II/contrib/cmake/macros/macro_check_cxx_compiler_bug.cmake b/deal.II/contrib/cmake/macros/macro_check_cxx_compiler_bug.cmake index b920522f20..0e38b74598 100644 --- a/deal.II/contrib/cmake/macros/macro_check_cxx_compiler_bug.cmake +++ b/deal.II/contrib/cmake/macros/macro_check_cxx_compiler_bug.cmake @@ -14,7 +14,7 @@ MACRO(CHECK_CXX_COMPILER_BUG source var) IF(${var}_OK) MESSAGE(STATUS "Test successful, do not define ${var}") ELSE() - MESSAGE(STATUS "Test unsuccessful, definig ${var}") + MESSAGE(STATUS "Test unsuccessful, define ${var}") SET(${var} 1) ENDIF() diff --git a/deal.II/contrib/cmake/macros/macro_configure_feature.cmake b/deal.II/contrib/cmake/macros/macro_configure_feature.cmake index 0d1dcb1ffc..753e876e4e 100644 --- a/deal.II/contrib/cmake/macros/macro_configure_feature.cmake +++ b/deal.II/contrib/cmake/macros/macro_configure_feature.cmake @@ -71,7 +71,7 @@ ENDMACRO() MACRO(CONFIGURE_FEATURE feature) - # Only (try) to configure ${feature} if we have to: + # Only try to configure ${feature} if we have to: IF(DEAL_II_FEATURE_AUTODETECTION OR DEAL_II_WITH_${feature}) # @@ -106,7 +106,7 @@ MACRO(CONFIGURE_FEATURE feature) ) ENDIF() - ELSE() + ELSE(DEAL_II_FORCE_CONTRIB_${feature}) # # Second case: We are allowed to search for an external library: @@ -181,7 +181,7 @@ MACRO(CONFIGURE_FEATURE feature) ENDIF() ENDIF() - ENDIF() + ENDIF(DEAL_II_FORCE_CONTRIB_${feature}) ENDIF() ENDMACRO() -- 2.39.5