From d5b29155b47935c230b0f949c6fb0e0962173395 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Tue, 21 Sep 2010 22:27:14 +0200 Subject: [PATCH 1/3] APPEND and not-APPEND mode of feature_summary() were swapped Alex --- Modules/FeatureSummary.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index 594e2e75a..78788f410 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -211,9 +211,9 @@ FUNCTION(FEATURE_SUMMARY) IF(_FS_FILENAME) IF(_FS_APPEND) - FILE(WRITE "${_FS_FILENAME}" "${_fullText}") - ELSE(_FS_APPEND) FILE(APPEND "${_FS_FILENAME}" "${_fullText}") + ELSE(_FS_APPEND) + FILE(WRITE "${_FS_FILENAME}" "${_fullText}") ENDIF(_FS_APPEND) ELSE(_FS_FILENAME) From 07bca488683c3382b76c7ba6f89eeb87961dc9ba Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Tue, 21 Sep 2010 22:31:04 +0200 Subject: [PATCH 2/3] Set a default DESCRIPTION if none is given for ALL mode of feature_summary() Alex --- Modules/FeatureSummary.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index 78788f410..c761e7a64 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -199,16 +199,20 @@ FUNCTION(FEATURE_SUMMARY) OR "${_FS_WHAT}" STREQUAL "PACKAGES_FOUND" OR "${_FS_WHAT}" STREQUAL "PACKAGES_NOT_FOUND") _FS_GET_FEATURE_SUMMARY( ${_FS_WHAT} _featureSummary) + SET(_fullText "${_FS_DESCRIPTION}${_featureSummary}\n") ELSEIF("${_FS_WHAT}" STREQUAL "ALL") _FS_GET_FEATURE_SUMMARY( PACKAGES_FOUND _tmp1) _FS_GET_FEATURE_SUMMARY( PACKAGES_NOT_FOUND _tmp2) SET(_featureSummary "${_tmp1}${_tmp2}") + IF(_FS_DESCRIPTION) + SET(_fullText "${_FS_DESCRIPTION}${_tmp1}${_tmp2}\n") + ELSE(_FS_DESCRIPTION) + SET(_fullText "-- Found the following packages:${_tmp1}\n-- Did not find the following packages:${_tmp2}\n") + ENDIF(_FS_DESCRIPTION) ELSE() MESSAGE(FATAL_ERROR "The WHAT argument of FEATURE_SUMMARY() is set to ${_FS_WHAT}, which is not a valid value.") ENDIF() - SET(_fullText "${_FS_DESCRIPTION}${_featureSummary}\n") - IF(_FS_FILENAME) IF(_FS_APPEND) FILE(APPEND "${_FS_FILENAME}" "${_fullText}") From b935f00fdf0ad30102ba4eca05f720e977fa59da Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Tue, 21 Sep 2010 22:43:04 +0200 Subject: [PATCH 3/3] Close ENDFUNCTION() properly with the same name as FUNCTION() Alex --- Modules/FeatureSummary.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index c761e7a64..f7bfe27e7 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -120,7 +120,7 @@ FUNCTION(ADD_FEATURE_INFO _name _enabled _desc) ENDIF () SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_DESCRIPTION "${_desc}" ) -ENDFUNCTION(SET_FEATURE_INFO) +ENDFUNCTION(ADD_FEATURE_INFO) FUNCTION(SET_FEATURE_INFO)