diff options
| author | Allen Winter <winter@kde.org> | 2008-01-12 16:34:14 +0000 | 
|---|---|---|
| committer | Allen Winter <winter@kde.org> | 2008-01-12 16:34:14 +0000 | 
| commit | d5e405ffeae838614d49dd94f30cc13451065eb1 (patch) | |
| tree | 516b8891ae72c3c46ecba0ba13696c752a4d4fd4 | |
| parent | 96fa4f5b130490766a58e80d0bfb38813c79efba (diff) | |
| download | extra-cmake-modules-d5e405ffeae838614d49dd94f30cc13451065eb1.tar.gz extra-cmake-modules-d5e405ffeae838614d49dd94f30cc13451065eb1.tar.bz2 | |
- if all packages were found, provide a message saying so
- cleanup the output a little.
- not all found packages are optional; some are required. so reduce
  confusion by saying "external" instead.
svn path=/trunk/KDE/kdelibs/; revision=760423
| -rw-r--r-- | modules/MacroLogFeature.cmake | 17 | 
1 files changed, 14 insertions, 3 deletions
| diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index cac4ef87..f0f39882 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -88,27 +88,38 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG)     SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt)     IF (EXISTS ${_file})        FILE(READ ${_file} _requirements) -      MESSAGE(STATUS "\n-------------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.      --\n-- Please install them before continuing with this software installation.    --\n-------------------------------------------------------------------------------\n${_requirements}-------------------------------------------------------------------------------") +      MESSAGE(STATUS "\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- Please install them before continuing this software installation.\n-----------------------------------------------------------------------------\n${_requirements}-----------------------------------------------------------------------------")        FILE(REMOVE ${_file})        MESSAGE(FATAL_ERROR "Exiting: Missing Requirements")     ENDIF (EXISTS ${_file})     SET(_summary "\n") +   SET(_elist 0)     SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)     IF (EXISTS ${_file}) +      SET(_elist 1)        FILE(READ ${_file} _enabled)        FILE(REMOVE ${_file}) -      SET(_summary "${_summary}-------------------------------------------------------------------------------\n-- The following OPTIONAL packages were located on your system.              --\n-- This software installation will have features provided by these packages. --\n-------------------------------------------------------------------------------\n${_enabled}") +      SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n${_enabled}")     ENDIF (EXISTS ${_file}) +   SET(_dlist 0)     SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)     IF (EXISTS ${_file}) +      SET(_dlist 1)        FILE(READ ${_file} _disabled)        FILE(REMOVE ${_file}) -       SET(_summary "${_summary}-------------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.      --\n-- Consider installing them to enable more features from this software.      --\n-------------------------------------------------------------------------------\n${_disabled}") +      SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n${_disabled}") +   ELSE (EXISTS ${_file}) +      IF (${_elist}) +        SET(_summary "${_summary}Congratulations! All external packages have been found.\n") +      ENDIF (${_elist})     ENDIF (EXISTS ${_file}) +   IF (${_elist} OR ${_dlist}) +      SET(_summary "${_summary}-----------------------------------------------------------------------------\n") +   ENDIF (${_elist} OR ${_dlist})     MESSAGE(STATUS "${_summary}")  ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) | 
