diff options
| -rw-r--r-- | modules/MacroLogFeature.cmake | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index f48a6cc2..db2723b6 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -68,14 +68,17 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ SET(_logtext "+ ${_package}") - IF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext}, ${_minvers}") - ENDIF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext}: ${_description} <${_url}>") - IF (${_comments} MATCHES ".*") - SET(_logtext "${_logtext}\n${_comments}") - ENDIF (${_comments} MATCHES ".*") - FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n\n") + IF (NOT ${_var}) + IF (${_minvers} MATCHES ".*") + SET(_logtext "${_logtext}, ${_minvers}") + ENDIF (${_minvers} MATCHES ".*") + SET(_logtext "${_logtext}: ${_description} <${_url}>") + IF (${_comments} MATCHES ".*") + SET(_logtext "${_logtext}\n${_comments}") + ENDIF (${_comments} MATCHES ".*") +# SET(_logtext "${_logtext}\n") #double-space missing features? + ENDIF (NOT ${_var}) + FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n") ENDMACRO(MACRO_LOG_FEATURE) @@ -85,28 +88,27 @@ 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 list of REQUIRED packages could not be located on your system. --\n-- Please install them before continuing with this software installation. --\n----------------------------------------------------------------------------------\n${_requirements}----------------------------------------------------------------------------------") -# MESSAGE(STATUS "MISSING REQUIREMENTS\n${_requirements}\n") + MESSAGE(STATUS "\n----------------------------------------------------------------------------------\n-- The following list of REQUIRED packages could NOT be located on your system. --\n-- Please install them before continuing with this software installation. --\n----------------------------------------------------------------------------------\n${_requirements}----------------------------------------------------------------------------------") FILE(REMOVE ${_file}) MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") ENDIF (EXISTS ${_file}) SET(_summary "\n") + SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _enabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}--------------------------------------------------------------------------------\n-- The following list of packages were located on your system. --\n-- You will have all the following features available from this software. --\n--------------------------------------------------------------------------------\n${_enabled}") -# SET(_summary "${_summary}Enabled Features:\n${_enabled}") + SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages were located on your system. --\n-- You will have all the following features available from this software. --\n----------------------------------------------------------------------------------\n${_enabled}") ENDIF (EXISTS ${_file}) SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _disabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}--------------------------------------------------------------------------------\n-- The following list of 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}Disabled Features:\n${_disabled}") + SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages could NOT be located on your system. --\n-- Consider installing them to enable more features from this software. --\n----------------------------------------------------------------------------------\n${_disabled}") ENDIF (EXISTS ${_file}) + MESSAGE(STATUS "${_summary}") ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) |