kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FeatureSummary-no-duplicates'

Browse Source 
38ef2b73 FeatureSummary: Print each feature info only once
This commit is contained in:
Brad King 2015-02-24 09:12:43 -05:00 committed by CMake Topic Stage
commit 13f9f848de
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/FeatureSummary.cmake
View File

@ -379,6 +379,9 @@ function(_FS_GET_FEATURE_SUMMARY _property _var _includeQuiet)
set(_currentFeatureText "") set(_currentFeatureText "")
get_property(_EnabledFeatures GLOBAL PROPERTY ${_property}) get_property(_EnabledFeatures GLOBAL PROPERTY ${_property})
if(_EnabledFeatures)
list(REMOVE_DUPLICATES _EnabledFeatures)
endif(_EnabledFeatures)
foreach(_currentFeature ${_EnabledFeatures}) foreach(_currentFeature ${_EnabledFeatures})

4
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt Normal file
View File

@ -0,0 +1,4 @@
--( )
\* Foo , Foo decscription\.
+
--

8
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake Normal file
View File

@ -0,0 +1,8 @@
include(FeatureSummary)
set(WITH_FOO 1)
add_feature_info(Foo WITH_FOO "Foo decscription.")
add_feature_info(Foo WITH_FOO "Foo decscription.")
feature_summary(WHAT ENABLED_FEATURES)

1
Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
View File

@ -6,3 +6,4 @@ run_cmake(FeatureSummaryWhatSingleUnknown)
run_cmake(FeatureSummaryWhatList) run_cmake(FeatureSummaryWhatList)
run_cmake(FeatureSummaryWhatListUnknown) run_cmake(FeatureSummaryWhatListUnknown)
run_cmake(FeatureSummaryWhatListAll) run_cmake(FeatureSummaryWhatListAll)
run_cmake(FeatureSummaryWhatOnce)