Please find attached a patch to MacroLogFeature which IMHO makes for a much
nicer output than the current version.
Would it be OK to commit to trunk and 4.2?
If not, please comment.
Cheers,
Sebastian
Index: MacroLogFeature.cmake
===================================================================
--- MacroLogFeature.cmake (revision 910841)
+++ MacroLogFeature.cmake (working copy)
@@ -66,60 +66,75 @@
ENDIF (${_required} MATCHES "[Tt][Rr][Uu][Ee]")
ENDIF (${_var})
- SET(_logtext "+ ${_package}")
+ SET(_logtext " * ${_package}")
IF (NOT ${_var})
IF (${_minvers} MATCHES ".*")
- SET(_logtext "${_logtext}, ${_minvers} or higher")
+ SET(_logtext "${_logtext} (${_minvers} or higher)")
ENDIF (${_minvers} MATCHES ".*")
- SET(_logtext "${_logtext}: ${_description} <${_url}>")
+ SET(_logtext "${_logtext} <${_url}>")
+ ENDIF (NOT ${_var})
+
+ SET(_logtext "${_logtext}\n ${_description}")
+
+ IF (NOT ${_var})
IF (${_comments} MATCHES ".*")
- SET(_logtext "${_logtext}\n${_comments}")
+ SET(_logtext "${_logtext}\n ${_comments}")
ENDIF (${_comments} MATCHES ".*")
# SET(_logtext "${_logtext}\n") #double-space missing features?
ENDIF (NOT ${_var})
- FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n")
+
+ FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n\n")
ENDMACRO(MACRO_LOG_FEATURE)
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 this software installation.\n-----------------------------------------------------------------------------\n${_requirements}-----------------------------------------------------------------------------")
- FILE(REMOVE ${_file})
- MESSAGE(FATAL_ERROR "Exiting: Missing Requirements")
- ENDIF (EXISTS ${_file})
+ SET(_missingFile ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
+ SET(_enabledFile ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
+ SET(_disabledFile ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
- SET(_summary "\n")
+ IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
+ SET(_printSummary TRUE)
+ ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
- 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 external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n${_enabled}")
- ENDIF (EXISTS ${_file})
+ IF(_printSummary)
+ MESSAGE(STATUS "\n\n-----------------------------------------------------------------------------\n-- Configuration Summary:\n-----------------------------------------------------------------------------\n")
- 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${_disabled}")
- ELSE (EXISTS ${_file})
- IF (${_elist})
- SET(_summary "${_summary}Congratulations! All external packages have been found.\n")
- ENDIF (${_elist})
- ENDIF (EXISTS ${_file})
+ IF (EXISTS ${_missingFile})
+ FILE(READ ${_missingFile} _requirements)
+ SET(_summary " --------------------------------------------------------------------------\n The following REQUIRED packages could NOT be located on your system.\n Please install them before continuing this software installation.\n --------------------------------------------------------------------------\n\n${_requirements}")
+ FILE(REMOVE ${_missingFile})
+ SET(_haveMissingReq 1)
+ ENDIF (EXISTS ${_missingFile})
- IF (${_elist} OR ${_dlist})
- SET(_summary "${_summary}-----------------------------------------------------------------------------\n")
- ENDIF (${_elist} OR ${_dlist})
- MESSAGE(STATUS "${_summary}")
+ SET(_elist 0)
+ IF (EXISTS ${_enabledFile})
+ SET(_elist 1)
+ FILE(READ ${_enabledFile} _enabled)
+ FILE(REMOVE ${_enabledFile})
+ 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 --------------------------------------------------------------------------\n\n${_enabled}")
+ ENDIF (EXISTS ${_enabledFile})
+ SET(_dlist 0)
+ IF (EXISTS ${_disabledFile})
+ SET(_dlist 1)
+ FILE(READ ${_disabledFile} _disabled)
+ FILE(REMOVE ${_disabledFile})
+ 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\n${_disabled}")
+ ELSE (EXISTS ${_disabledFile})
+ IF (${_elist})
+ SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- Congratulations! All external packages have been found.")
+ ENDIF (${_elist})
+ ENDIF (EXISTS ${_disabledFile})
+
+ MESSAGE(${_summary})
+ IF(_haveMissingReq)
+ MESSAGE(FATAL_ERROR "Exiting: Missing Requirements")
+ ENDIF(_haveMissingReq)
+
+ MESSAGE("-----------------------------------------------------------------------------\n")
+ ENDIF(_printSummary)
+
ENDMACRO(MACRO_DISPLAY_FEATURE_LOG)
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
