From 5bf0d38e14534122e3200218a1918f7cd7acab77 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 23 Dec 2013 10:05:06 +0000 Subject: [PATCH] CMake: Improve error message git-svn-id: https://svn.dealii.org/trunk@32099 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_configure_feature.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/deal.II/cmake/macros/macro_configure_feature.cmake b/deal.II/cmake/macros/macro_configure_feature.cmake index 4a35b260fd..240e2bfa0d 100644 --- a/deal.II/cmake/macros/macro_configure_feature.cmake +++ b/deal.II/cmake/macros/macro_configure_feature.cmake @@ -100,14 +100,15 @@ or set the relevant variables by hand in ccmake." ) ELSE() SET(_hint_snippet - "or set the relevant variables by hand in ccmake." + " or set the relevant variables by hand in ccmake." ) ENDIF() IF(FEATURE_${_feature}_HAVE_BUNDLED) SET(_bundled_snippet - "\n\nAlternatively you may choose to compile the bundled library of -${_feature_lowercase} by setting DEAL_II_ALLOW_BUNDLED=on or\nDEAL_II_FORCE_BUNDLED_${_feature}=on.\n" + "\nAlternatively you may choose to compile the bundled library of " + "${_feature_lowercase} by setting DEAL_II_ALLOW_BUNDLED=on or " + "DEAL_II_FORCE_BUNDLED_${_feature}=on.\n" ) ELSE() SET(_bundled_snippet "\n") @@ -117,7 +118,7 @@ ${_feature_lowercase} by setting DEAL_II_ALLOW_BUNDLED=on or\nDEAL_II_FORCE_BUND "Could not find the ${_feature_lowercase} library!\n" ${${_feature}_ADDITIONAL_ERROR_STRING} "Please ensure that a suitable ${_feature_lowercase} library is installed on your computer.\n" - "If the library is not at a default location, either provide some hints\n" + "If the library is not at a default location, either provide some hints " "for autodetection,${_hint_snippet}${_bundled_snippet}" ) ENDMACRO() @@ -156,8 +157,8 @@ MACRO(CONFIGURE_FEATURE _feature) STRING(REGEX REPLACE "^DEAL_II_WITH_" "" _dependency ${_dependency}) IF(NOT FEATURE_${_dependency}_PROCESSED) MESSAGE(FATAL_ERROR "\n" - "Internal build system error:\nDEAL_II_WITH_${_feature} depends on " - "DEAL_II_WITH_${_dependency},\nbut CONFIGURE_FEATURE(${_feature}) " + "Internal build system error: DEAL_II_WITH_${_feature} depends on " + "DEAL_II_WITH_${_dependency}, but CONFIGURE_FEATURE(${_feature}) " "was called before CONFIGURE_FEATURE(${_dependency}).\n\n" ) ENDIF() -- 2.39.5